这是indexloc提供的服务，不要输入任何密码
Skip to content

scripts(toolchain): several changes related to $TERMUX_PREFIX/include #23513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 26, 2025
Merged

scripts(toolchain): several changes related to $TERMUX_PREFIX/include #23513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions packages/ghostscript/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Interpreter for the PostScript language and for PDF"
TERMUX_PKG_LICENSE="AGPL-V3"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="10.03.1"
TERMUX_PKG_REVISION=1
TERMUX_PKG_REVISION=2
TERMUX_PKG_SRCURL=https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${TERMUX_PKG_VERSION//.}/ghostpdl-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=8ea9dd8768b64576bc4ee2d79611450c9e1edeb686f7824f3bf94b92457b882a
TERMUX_PKG_AUTO_UPDATE=false
Expand Down Expand Up @@ -31,14 +31,6 @@ termux_step_post_get_source() {
termux_step_pre_configure() {
CPPFLAGS+=" -I${TERMUX_STANDALONE_TOOLCHAIN}/sysroot/usr/include/c++/v1"

# Workaround for build break caused by `sha2.h` from `libmd` package:
if [ -e "$TERMUX_PREFIX/include/sha2.h" ]; then
local inc="$TERMUX_PKG_BUILDDIR/_include"
mkdir -p "${inc}"
ln -sf "$TERMUX_PKG_SRCDIR/base/sha2.h" "${inc}/"
CPPFLAGS="-I${inc} ${CPPFLAGS}"
fi

if [[ "${TERMUX_ARCH}" == "aarch64" ]]; then
# https://github.com/llvm/llvm-project/issues/74361
# NDK r27: clang++: error: unsupported option '-mfpu=' for target 'aarch64-linux-android24'
Expand Down
5 changes: 3 additions & 2 deletions packages/proxmark3/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="The Swiss Army Knife of RFID Research - RRG/Iceman repo"
TERMUX_PKG_LICENSE="GPL-3.0"
TERMUX_PKG_MAINTAINER="Marlin Sööse <marlin.soose@esque.ca>"
TERMUX_PKG_VERSION="1:4.19552"
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://github.com/RfidResearchGroup/proxmark3/archive/refs/tags/v${TERMUX_PKG_VERSION:2}.tar.gz
TERMUX_PKG_SHA256=43f0f5ddbbca478c5be33a6392847a99e2fda47b0a2d21e89fed4a918808f405
TERMUX_PKG_AUTO_UPDATE=true
Expand All @@ -11,8 +12,8 @@ TERMUX_PKG_BUILD_IN_SRC="true"
TERMUX_PKG_BLACKLISTED_ARCHES="i686, x86_64"

termux_step_post_configure() {
export LDLIBS="-L${TERMUX_PREFIX}/lib"
export INCLUDES="-I${TERMUX_PREFIX}/include"
export LDLIBS="$LDFLAGS"
export INCLUDES="$CPPFLAGS"
TERMUX_PKG_EXTRA_MAKE_ARGS="client CC=$CC CXX=$CXX LD=$CXX cpu_arch=$TERMUX_ARCH SKIPREVENGTEST=1 SKIPQT=1 SKIPPTHREAD=1 SKIPGD=1 PLATFORM=PM3GENERIC"
}

Expand Down
17 changes: 11 additions & 6 deletions packages/simulavr/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ _VERSION_MAJOR=1
_VERSION_MINOR=1
_VERSION_PATCH=0
TERMUX_PKG_VERSION=1:${_VERSION_MAJOR}.${_VERSION_MINOR}.${_VERSION_PATCH}
TERMUX_PKG_REVISION=1
TERMUX_PKG_REVISION=2
TERMUX_PKG_SRCURL="git+https://git.savannah.nongnu.org/git/simulavr"
TERMUX_PKG_GIT_BRANCH=release-${TERMUX_PKG_VERSION#*:}
TERMUX_PKG_DEPENDS="libc++"
Expand All @@ -28,11 +28,16 @@ termux_step_post_get_source() {
| patch --silent -p1
}

termux_step_post_make_install() {
mv "$TERMUX_PREFIX/share/doc/common" "$TERMUX_PREFIX/share/doc/simulavr"
termux_step_make_install() {
install -DTm755 "$TERMUX_PKG_BUILDDIR"/app/"$TERMUX_PKG_NAME" \
"$TERMUX_PREFIX"/bin/"$TERMUX_PKG_NAME"
install -Dm644 "$TERMUX_PKG_BUILDDIR"/libsim/libsim.so \
-t "$TERMUX_PREFIX"/lib/
install -Dm644 "$TERMUX_PKG_BUILDDIR"/doc/{copyright,SUPPORT,AUTHORS,README.gdb,NEWS,TODO,README} \
-t "$TERMUX_PREFIX"/share/doc/"$TERMUX_PKG_NAME"
install -DTm644 "$TERMUX_PKG_BUILDDIR"/doc/COPYING \
"$TERMUX_PREFIX"/share/doc/"$TERMUX_PKG_NAME"/LICENSE
# Headers are moved into their own subdirectory to prevent conflicts.
# Might cause issues when using them.
mv "$TERMUX_PREFIX/include" "$TERMUX_PREFIX/include-simulavr"
mkdir "$TERMUX_PREFIX/include"
mv "$TERMUX_PREFIX/include-simulavr" "$TERMUX_PREFIX/include/simulavr"
cp -rf "$TERMUX_PKG_BUILDDIR"/include/ "$TERMUX_PREFIX"/include/"$TERMUX_PKG_NAME"
}
4 changes: 2 additions & 2 deletions scripts/build/toolchain/termux_setup_toolchain_23c.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ termux_setup_toolchain_23c() {
fi

export CXXFLAGS="$CFLAGS"
export CPPFLAGS+=" -I${TERMUX_PREFIX}/include"
export CPPFLAGS+=" -isystem${TERMUX_PREFIX}/include"

# If libandroid-support is declared as a dependency, link to it explicitly:
if [ "$TERMUX_PKG_DEPENDS" != "${TERMUX_PKG_DEPENDS/libandroid-support/}" ]; then
Expand All @@ -92,7 +92,7 @@ termux_setup_toolchain_23c() {
export GOOS=android
export CGO_ENABLED=1
export GO_LDFLAGS="-extldflags=-pie"
export CGO_CFLAGS="-I$TERMUX_PREFIX/include"
export CGO_CFLAGS="-isystem$TERMUX_PREFIX/include"

export CARGO_TARGET_NAME="${TERMUX_ARCH}-linux-android"
if [[ "${TERMUX_ARCH}" == "arm" ]]; then
Expand Down
4 changes: 2 additions & 2 deletions scripts/build/toolchain/termux_setup_toolchain_27c.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ termux_setup_toolchain_27c() {
fi

export CXXFLAGS="$CFLAGS"
export CPPFLAGS+=" -I${TERMUX_PREFIX}/include"
export CPPFLAGS+=" -isystem${TERMUX_PREFIX}/include"

# If libandroid-support is declared as a dependency, link to it explicitly:
if [ "$TERMUX_PKG_DEPENDS" != "${TERMUX_PKG_DEPENDS/libandroid-support/}" ]; then
Expand All @@ -93,7 +93,7 @@ termux_setup_toolchain_27c() {
export CGO_ENABLED=1
export GO_LDFLAGS="-extldflags=-pie"
export CGO_LDFLAGS="${LDFLAGS/ -Wl,-z,relro,-z,now/}"
export CGO_CFLAGS="-I$TERMUX_PREFIX/include"
export CGO_CFLAGS="-isystem$TERMUX_PREFIX/include"

export CARGO_TARGET_NAME="${TERMUX_ARCH}-linux-android"
if [[ "${TERMUX_ARCH}" == "arm" ]]; then
Expand Down