TERMUX_PKG_HOMEPAGE=http://openjdk.java.net
TERMUX_PKG_DESCRIPTION="OpenJDK 9 Java Runtime Environment (prerelease)"
-_jbuild=168
+_jbuild=181
_hg_tag="jdk-9+${_jbuild}"
_jvm_dir="lib/jvm/openjdk-9"
-TERMUX_PKG_VERSION="9.2017.5.12"
+TERMUX_PKG_VERSION="9.2017.8.20"
TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas"
TERMUX_PKG_HOMEPAGE=http://openjdk.java.net/projects/jdk9
TERMUX_PKG_DEPENDS="freetype, libpng, ca-certificates-java"
"
TERMUX_PKG_CLANG=no
TERMUX_PKG_RM_AFTER_INSTALL="$_jvm_dir/demo $_jvm_dir/sample"
-_cups_ver=2.2.3
-
-changesets=('d3e4e68dc2a4'
- 'b2218d41edef'
- '2982a1d6ecfc'
- '69b4c97b87b5'
- '912cf69806d5'
- '5d9d2a65fb26'
- '0e522ff8b9f5'
- '131e25008015')
-
-sha256sums=('6e38d7ff3ae082206b43973fd43c07c88d1e5b30985e0c4d8357c364f51cf66c'
- '3173a9b6bc380ebdda014c512f0f88871a8ebdea3fda0d9ad350dba42a3493d6'
- 'ff1342410d63ccec54f3e043b74fbc0549b01260bb15170515c68a8dfb4f7b0b'
- 'cda559ee5cae0f8ab0c7ea19d70eaff58e7a44462786c78dfa8811f24d548aef'
- 'a24208276b465e64085890d7daf5c4d25eb8abf629d636477f85e8849a7c978a'
- 'a1b1a77118183000cf20bac7e10e7272145dc64e1120ccb4559b8df7160a48db'
- '3f4517e94efb689a291dce74ac2a12e496767d417a05d7fc6c74c483f3d14cca'
- '961adb3a0facfec181ff3b999b6fa079dffb1ff4a8f5607905f5ea28dcc597bf'
- '66701fe15838f2c892052c913bde1ba106bbee2e0a953c955a62ecacce76885f')
+_cups_ver=2.2.4
+
+changesets=('e5455438db96'
+ '5666eba44ac6'
+ '8076a7391ba0'
+ '17bb8a98d5e3'
+ 'a1d64f45f9d5'
+ '364631d8ff2e'
+ '65bfdabaab9c'
+ '17cc754c8936')
+
+sha256sums=('c759faa5bff4b3d7bcf87dce57e9d1a39600ef67ec68f96d6d12d07b1bf773ce'
+ '34518bf8b27aa893f834f8f81293ac0e04a210ee4f2e11bb2c89331f87912d96'
+ '3b649e34e2a1c8758c6311931d201a38432088ccb86a720afb1cb99fe193537f'
+ 'bb330b8b516178304dc11c755994db20eccc696ae5c2a16b04a4a67b20b33b79'
+ 'a213ebc4bf896c55855761891932a19f42ad5276d3fd155cfb604b27f4866d9d'
+ '0bc1953e9f23d59dafc415a7a37ff2da23cf8782e0532e253a6d7d63aa0ea954'
+ '739a5d275db4a2a81cf3c3ca17a78212b8c47092e5c10888b79e9599dd9dcc2d'
+ 'fbc9b49a7f0fa1723e369d91068d51a11de40e931f281a3ed9650484b437cc7f'
+ '596d4db72651c335469ae5f37b0da72ac9f97d73e30838d787065f559dea98cc')
reponames=(dev corba hotspot jdk jaxws jaxp langtools nashorn cups)
termux_step_pre_configure () {
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-cups-include=$TERMUX_PKG_SRCDIR/cups-$_cups_ver"
+ ln -sf $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/libc.so $TERMUX_PKG_TMPDIR/libpthread.so
+
cat > "$TERMUX_STANDALONE_TOOLCHAIN/devkit.info" <<HERE
DEVKIT_NAME="Android ${TERMUX_ARCH^^}"
DEVKIT_TOOLCHAIN_PATH="\$DEVKIT_ROOT/$TERMUX_HOST_PLATFORM/bin"
# remove sa_proc support
rm $TERMUX_PKG_SRCDIR/hotspot/make/lib/Lib-jdk.hotspot.agent.gmk
}
-
termux_step_configure () {
+ if [ $TERMUX_ARCH = "x86_64" ]; then
+ ln -sf $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib64/libc.so $TERMUX_PKG_TMPDIR/libpthread.so
+ else
+ ln -sf $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/libc.so $TERMUX_PKG_TMPDIR/libpthread.so
+ fi
+ ARM64=""
+ if [ $TERMUX_ARCH = aarch64 ]; then
+ export ARM64=" --with-cpu-port=arm64"
+ fi
+
bash $TERMUX_PKG_SRCDIR/configure \
+ $ARM64 \
--prefix=$TERMUX_PREFIX \
--openjdk-target=$BUILD_TRIPLE \
--libexecdir=$TERMUX_PREFIX/libexec \
--with-devkit=$ANDROID_DEVKIT \
--with-extra-cflags="$CPPFLAGS $CFLAGS" \
--with-extra-cxxflags="$CPPFLAGS $CXXFLAGS" \
- --with-extra-ldflags="$LDFLAGS" \
+ --with-extra-ldflags="-L$TERMUX_PKG_TMPDIR $LDFLAGS -ldl" \
--with-jvm-features="$JVM_FEATURES" \
$TERMUX_PKG_EXTRA_CONFIGURE_ARGS
}
rm -f $TERMUX_PREFIX/bin/$binary
echo "export JAVA_HOME=\$PREFIX/$_jvm_dir" > $TERMUX_PREFIX/bin/$binary
echo "export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:\$JAVA_HOME/lib:\$JAVA_HOME/lib/jli" >> $TERMUX_PREFIX/bin/$binary
- echo "\$JAVA_HOME/bin/$binary \"\$@\"" >> $TERMUX_PREFIX/bin/$binary
+ echo "exec \$JAVA_HOME/bin/$binary \"\$@\"" >> $TERMUX_PREFIX/bin/$binary
chmod u+x $TERMUX_PREFIX/bin/$binary
done