~mdw
/
termux-packages
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
openjdk-9-headless: make it build (at least on arm) (#820)
[termux-packages]
/
build-package.sh
diff --git
a/build-package.sh
b/build-package.sh
index
bcdc594
..
2df9b50
100755
(executable)
--- a/
build-package.sh
+++ b/
build-package.sh
@@
-218,7
+218,7
@@
termux_step_setup_variables() {
TERMUX_STANDALONE_TOOLCHAIN="$TERMUX_TOPDIR/_lib/toolchain-${TERMUX_ARCH}-ndk${TERMUX_NDK_VERSION}-api${TERMUX_API_LEVEL}"
# Bump the below version if a change is made in toolchain setup to ensure
# that everyone gets an updated toolchain:
TERMUX_STANDALONE_TOOLCHAIN="$TERMUX_TOPDIR/_lib/toolchain-${TERMUX_ARCH}-ndk${TERMUX_NDK_VERSION}-api${TERMUX_API_LEVEL}"
# Bump the below version if a change is made in toolchain setup to ensure
# that everyone gets an updated toolchain:
- TERMUX_STANDALONE_TOOLCHAIN+="-v1
5
"
+ TERMUX_STANDALONE_TOOLCHAIN+="-v1
7
"
export TERMUX_TAR="tar"
export TERMUX_TOUCH="touch"
export TERMUX_TAR="tar"
export TERMUX_TOUCH="touch"
@@
-564,6
+564,10
@@
termux_step_setup_toolchain() {
# ifaddrs.h: Added in android-24 unified headers, use a inline implementation for now.
cp "$TERMUX_SCRIPTDIR"/ndk_patches/{elf.h,sysexits.h,ifaddrs.h} $_TERMUX_TOOLCHAIN_TMPDIR/sysroot/usr/include
# ifaddrs.h: Added in android-24 unified headers, use a inline implementation for now.
cp "$TERMUX_SCRIPTDIR"/ndk_patches/{elf.h,sysexits.h,ifaddrs.h} $_TERMUX_TOOLCHAIN_TMPDIR/sysroot/usr/include
+ # Remove <sys/shm.h> from the NDK in favour of that from the libandroid-shmem.
+ # Also remove <sys/sem.h> as it doesn't work for non-root.
+ rm $_TERMUX_TOOLCHAIN_TMPDIR/sysroot/usr/include/sys/{shm.h,sem.h}
+
local _LIBDIR=usr/lib
if [ $TERMUX_ARCH = x86_64 ]; then _LIBDIR+=64; fi
$TERMUX_ELF_CLEANER $_LIBDIR/*.so
local _LIBDIR=usr/lib
if [ $TERMUX_ARCH = x86_64 ]; then _LIBDIR+=64; fi
$TERMUX_ELF_CLEANER $_LIBDIR/*.so
@@
-625,6
+629,7
@@
termux_step_patch_package() {
sed "s%\@TERMUX_HOME\@%${TERMUX_ANDROID_HOME}%g" | \
patch --silent -p1
done
sed "s%\@TERMUX_HOME\@%${TERMUX_ANDROID_HOME}%g" | \
patch --silent -p1
done
+ shopt -u nullglob
}
# Replace autotools build-aux/config.{sub,guess} with ours to add android targets.
}
# Replace autotools build-aux/config.{sub,guess} with ours to add android targets.