sergiotarxz
/
termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

disabled packages: delete openjdk-9-jre-headless 

Replaced by openjdk-17
This commit is contained in:
Leonid Pliushch 2021-07-30 16:18:21 +03:00
parent 1758cb1578
commit ad4b0fb76f
No known key found for this signature in database
GPG Key ID: 45F2964132545795
13 changed files with 0 additions and 438 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

152
disabled-packages/openjdk-9-jre-headless/build.sh
View File

@ -1,152 +0,0 @@
TERMUX_PKG_HOMEPAGE=http://openjdk.java.net
TERMUX_PKG_DESCRIPTION="OpenJDK 9 Java Runtime Environment (prerelease)"
_jbuild=181
_hg_tag="jdk-9+${_jbuild}"
_jvm_dir="lib/jvm/openjdk-9"
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_CONFFILES="$_jvm_dir/lib/jvm.cfg"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--disable-aot
--disable-hotspot-gtest
--disable-option-checking
--disable-warnings-as-errors
--enable-headless-only
--with-freetype=$TERMUX_PREFIX
--with-libpng=system
--with-zlib=system
--with-jdk-variant=normal
--with-jvm-variants=server
"
TERMUX_PKG_RM_AFTER_INSTALL="$_jvm_dir/demo $_jvm_dir/sample"
_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)
_url_src=http://hg.openjdk.java.net/mobile/dev
TERMUX_PKG_SRCURL=$_url_src/archive/${changesets[0]}.tar.bz2
TERMUX_PKG_SHA256=${sha256sums[0]}
termux_step_post_extract_package() {
cd "$TERMUX_PKG_TMPDIR"
# download and extract repo archives
for index in {1..7}; do
local sum=${sha256sums[index]}
local repo=${reponames[index]}
local change=${changesets[index]}
local file=$TERMUX_PKG_CACHEDIR/$repo-$change.tar.bz2
local url=${_url_src}/$repo/archive/$change.tar.bz2
termux_download $url $file $sum
tar xf $file -C $TERMUX_PKG_SRCDIR
mv $TERMUX_PKG_SRCDIR/$repo-$change $TERMUX_PKG_SRCDIR/$repo
done
# setup cups source dir
file=$TERMUX_PKG_CACHEDIR/cups-$_cups_ver-source.tar.gz
url="https://github.com/apple/cups/releases/download/v$_cups_ver/$(basename $file)"
termux_download $url $file ${sha256sums[8]}
tar xf $file -C $TERMUX_PKG_SRCDIR
}
# override this step to since openjdk provides its own customized guess scripts
termux_step_replace_guess_scripts() {
return
}
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"
DEVKIT_SYSROOT="\$DEVKIT_ROOT/sysroot"
HERE
export ANDROID_DEVKIT=$TERMUX_STANDALONE_TOOLCHAIN
if [ -n "$TERMUX_DEBUG" ]; then TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-debug-level=slowdebug"; fi
BUILD_TRIPLE=$TERMUX_ARCH-linux-gnu
test "$TERMUX_ARCH" == "arm" && BUILD_TRIPLE+="eabi"
JVM_FEATURES="compiler1,compiler2,jvmti,fprof,vm-structs,jni-check,services,management,all-gcs,nmt,cds"
# enable features specific to some arches
if [ "$TERMUX_ARCH" == "aarch64" ] || [ "$TERMUX_ARCH" == "x86_64" ]; then JVM_FEATURES+=",jvmci,graal"; fi
# 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="-L$TERMUX_PKG_TMPDIR $LDFLAGS -ldl" \
--with-jvm-features="$JVM_FEATURES" \
$TERMUX_PKG_EXTRA_CONFIGURE_ARGS
}
termux_step_make() {
make JOBS=$TERMUX_MAKE_PROCESSES images
}
termux_step_post_make_install() {
# move jvm install dir
mkdir -p $TERMUX_PREFIX/lib/jvm
rm -rf "$TERMUX_PREFIX/lib/jvm/openjdk-9"
mv $TERMUX_PREFIX/jvm/openjdk-9-internal $TERMUX_PREFIX/$_jvm_dir
# place src.zip in standard location mimicking ubuntu
mv $TERMUX_PREFIX/$_jvm_dir/lib/src.zip $TERMUX_PREFIX/$_jvm_dir/src.zip
# create shell wrappers for binaries
for binary in $TERMUX_PREFIX/$_jvm_dir/bin/*; do
binary=$(basename $binary)
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 "exec \$JAVA_HOME/bin/$binary \"\$@\"" >> $TERMUX_PREFIX/bin/$binary
chmod u+x $TERMUX_PREFIX/bin/$binary
done
# use cacerts provided by ca-certificates-java
ln -sf "$TERMUX_PREFIX/$_jvm_dir/lib/security/jssecacerts" "$TERMUX_PREFIX/$_jvm_dir/lib/security/cacerts"
}

26
disabled-packages/openjdk-9-jre-headless/build_ldflags.patch
View File

@ -1,26 +0,0 @@
--- ./common/autoconf/generated-configure.sh 2017-05-14 10:01:38.475911076 +0530
+++ ../generated-configure.sh 2017-05-14 10:08:25.204273780 +0530
@@ -47809,8 +47809,8 @@
# Assume the C compiler is the assembler
BUILD_AS="$BUILD_CC -c"
# Just like for the target compiler, use the compiler as linker
- BUILD_LD="$BUILD_CC"
- BUILD_LDCXX="$BUILD_CXX"
+ BUILD_LD="$BUILD_CC -ldl -lpthread"
+ BUILD_LDCXX="$BUILD_CXX -ldl -lpthread"
PATH="$OLDPATH"
--- ./common/autoconf/generated-configure.sh 2017-05-14 10:50:10.292197720 +0530
+++ ../generated-configure.sh 2017-05-14 10:53:21.857704488 +0530
@@ -37441,8 +37441,8 @@
LDCXX="$LD"
else
# All other toolchains use the compiler to link.
- LD="$CC"
- LDCXX="$CXX"
+ LD="$CC -llog"
+ LDCXX="$CXX -llog"
fi
# FIXME: it should be CXXLD, according to standard (cf CXXCPP)

11
disabled-packages/openjdk-9-jre-headless/elfFile.hpp.patch
View File

@ -1,11 +0,0 @@
--- ./hotspot/src/share/vm/utilities/elfFile.hpp 2017-05-12 23:47:58.000000000 +0530
+++ ../elfFile.hpp 2017-05-14 12:27:21.069572447 +0530
@@ -50,7 +50,7 @@
typedef Elf64_Phdr Elf_Phdr;
typedef Elf64_Sym Elf_Sym;
-#if !defined(_ALLBSD_SOURCE) || defined(__APPLE__)
+#if (!defined(_ALLBSD_SOURCE) || defined(__APPLE__)) && !defined(__ANDROID__)
#define ELF_ST_TYPE ELF64_ST_TYPE
#endif

29
disabled-packages/openjdk-9-jre-headless/generated-configure.sh.patch
View File

@ -1,29 +0,0 @@
--- ./common/autoconf/generated-configure.sh 2017-04-01 23:19:09.508381398 +0530
+++ ../generated-configure.sh 2017-04-02 17:35:37.210373866 +0530
@@ -53412,14 +53412,7 @@
# Check if X11 is needed
- if test "x$OPENJDK_TARGET_OS" = xwindows || test "x$OPENJDK_TARGET_OS" = xmacosx || test "x$OPENJDK_TARGET_OS" = xios || test "x$OPENJDK_TARGET_OS" = xandroid; then
- # No X11 support on windows or macosx
NEEDS_LIB_X11=false
- else
- # All other instances need X11, even if building headless only, libawt still
- # needs X11 headers.
- NEEDS_LIB_X11=true
- fi
# Check if cups is needed
if test "x$OPENJDK_TARGET_OS" = xwindows; then
@@ -53435,11 +53428,7 @@
fi
# Check if alsa is needed
- if test "x$OPENJDK_TARGET_OS" = xlinux; then
- NEEDS_LIB_ALSA=true
- else
NEEDS_LIB_ALSA=false
- fi
# Check if ffi is needed
if [[ " $JVM_VARIANTS " =~ " zero " ]] || [[ " $JVM_VARIANTS " =~ " zeroshark " ]] ; then

43
disabled-packages/openjdk-9-jre-headless/getgr_r.patch
View File

@ -1,43 +0,0 @@
--- ./jdk/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c 2017-03-02 21:55:47.000000000 +0530
+++ ../UnixNativeDispatcher.c 2017-03-03 21:37:02.370375158 +0530
@@ -168,40 +168,6 @@
#endif
static fdopendir_func* my_fdopendir_func = NULL;
-#ifdef __ANDROID__
-/*
- * TODO: Android lacks support for the methods listed below. In it's place are
- * alternatives that use existing Android functionality, but lack reentrant
- * support. Determine if the following are the most suitable alternatives.
- *
- */
-int getgrgid_r(gid_t gid, struct group* grp, char* buf, size_t buflen, struct group** result)
-{
- *result = NULL;
- errno = 0;
- grp = getgrgid(gid);
- if (grp == NULL) {
- return errno;
- }
- // buf not used by caller (see below)
- *result = grp;
- return 0;
-}
-
-int getgrnam_r(const char *name, struct group* grp, char* buf, size_t buflen, struct group** result)
-{
- *result = NULL;
- errno = 0;
- grp = getgrnam(name);
- if (grp == NULL) {
- return errno;
- }
- // buf not used by caller (see below)
- *result = grp;
- return 0;
-}
-#endif
-
/**
* fstatat missing from glibc on Linux. Temporary workaround
* for x86/x64.

12
disabled-packages/openjdk-9-jre-headless/hotspot-jvm_home.patch
View File

@ -1,12 +0,0 @@
shoutout to @its-pointless (live_the_dream)
--- ./hotspot/src/share/vm/runtime/os.cpp 2017-03-30 20:45:45.000000000 +0530
+++ ../os.cpp 2017-03-31 11:04:17.097618021 +0530
@@ -74,7 +74,7 @@
int os::_processor_count = 0;
int os::_initial_active_processor_count = 0;
size_t os::_page_sizes[os::page_sizes_max];
-const char * os::_java_home = NULL;
+const char * os::_java_home = "@TERMUX_PREFIX@/lib/jvm/openjdk-9";
#ifndef PRODUCT
julong os::num_mallocs = 0; // # of calls to malloc/realloc

11
disabled-packages/openjdk-9-jre-headless/jdk-java_home.patch
View File

@ -1,11 +0,0 @@
--- ./jdk/src/java.base/unix/native/libjli/java_md_solinux.c 2017-03-30 20:45:48.000000000 +0530
+++ ../java_md_solinux.c 2017-03-31 09:15:07.979651293 +0530
@@ -163,7 +163,7 @@
*/
#ifdef __ANDROID__
-static char * __java_home = NULL;
+static char * __java_home = "@TERMUX_PREFIX@/lib/jvm/openjdk-9";
#endif
void SetJavaHome(char *arg) {

82
disabled-packages/openjdk-9-jre-headless/libpthread.patch
View File

@ -1,82 +0,0 @@
--- ./jdk/make/lib/Awt2dLibraries.gmk 2017-03-30 20:45:48.000000000 +0530
+++ ../Awt2dLibraries.gmk 2017-04-02 18:36:12.582240305 +0530
@@ -145,7 +145,7 @@
LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/utility
endif
-ifneq ($(filter $(OPENJDK_TARGET_OS), solaris linux macosx aix), )
+ifneq ($(filter $(OPENJDK_TARGET_OS), solaris macosx aix), )
LIBAWT_EXFILES += awt_Font.c CUPSfuncs.c fontpath.c X11Color.c
endif
@@ -212,7 +212,7 @@
LIBAWT_VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/java.desktop/windows/native/libawt/windows/awt.rc
endif
-ifeq ($(OPENJDK_TARGET_OS), android)
+ifeq ($(OPENJDK_TARGET_OS), linux)
LIBAWT_EXFILES += \
java2d/loops/TransformHelper.c \
java2d/loops/ScaledBlit.c \
@@ -347,10 +347,10 @@
endif
endif
- LIBAWT_XAWT_LIBS := $(LIBM) -lawt -lXext -lX11 -lXrender $(LIBDL) -lXtst -lXi -ljava -ljvm -lc
+ LIBAWT_XAWT_LIBS := $(LIBM) $(LIBDL) -ljava -ljvm -lc
ifeq ($(OPENJDK_TARGET_OS), linux)
- LIBAWT_XAWT_LIBS += -lpthread
+ LIBAWT_XAWT_LIBS += -lc
endif
ifeq ($(TOOLCHAIN_TYPE), gcc)
@@ -669,7 +669,7 @@
X11TextRenderer.c \
fontpath.c \
lcdglyph.c
-else ifeq ($(OPENJDK_TARGET_OS), android)
+else ifeq ($(OPENJDK_TARGET_OS), linux)
LIBFONTMANAGER_EXCLUDE_FILES += X11TextRenderer.c
else
LIBFONTMANAGER_EXCLUDE_FILES += fontpath.c \
@@ -939,7 +939,7 @@
LIBSPLASHSCREEN_LDFLAGS := -delayload:user32.dll
LIBSPLASHSCREEN_LIBS += kernel32.lib user32.lib gdi32.lib delayimp.lib $(WIN_JAVA_LIB) jvm.lib
else
- LIBSPLASHSCREEN_LIBS += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread -ldl
+ LIBSPLASHSCREEN_LIBS += $(LIBM) -lc -ldl
endif
$(eval $(call SetupNativeCompilation,BUILD_LIBSPLASHSCREEN, \
--- ./jdk/make/lib/Lib-java.desktop.gmk 2017-03-30 20:45:48.000000000 +0530
+++ ../Lib-java.desktop.gmk 2017-04-02 19:01:58.000696690 +0530
@@ -31,7 +31,7 @@
include LibosxLibraries.gmk
include PlatformLibraries.gmk
-ifeq (,$(filter $(OPENJDK_TARGET_OS), android ios))
+ifeq (,$(filter $(OPENJDK_TARGET_OS), android ios linux))
include Awt2dLibraries.gmk
endif
include SoundLibraries.gmk
--- ./jdk/make/lib/SoundLibraries.gmk 2017-03-30 20:45:48.000000000 +0530
+++ ../SoundLibraries.gmk 2017-04-02 19:14:25.382032835 +0530
@@ -69,16 +69,11 @@
LIBJSOUND_SRC_FILES += $(LIBJSOUND_PORTFILES)
endif # OPENJDK_TARGET_OS windows
-ifeq ($(OPENJDK_TARGET_OS), linux)
- EXTRA_SOUND_JNI_LIBS += jsoundalsa
- LIBJSOUND_CFLAGS += -DX_PLATFORM=X_LINUX
-endif # OPENJDK_TARGET_OS linux
-
ifeq ($(OPENJDK_TARGET_OS), aix)
LIBJSOUND_CFLAGS += -DX_PLATFORM=X_AIX
endif # OPENJDK_TARGET_OS aix
-ifeq ($(OPENJDK_TARGET_OS), android)
+ifeq ($(OPENJDK_TARGET_OS), linux)
LIBJSOUND_CFLAGS += -DX_PLATFORM=X_LINUX
endif

33
disabled-packages/openjdk-9-jre-headless/openjdk-9-jdk-headless.subpackage.sh
View File

@ -1,33 +0,0 @@
TERMUX_SUBPKG_INCLUDE="$_jvm_dir/bin/idlj bin/idlj
$_jvm_dir/bin/jar bin/jar
$_jvm_dir/bin/jarsigner bin/jarsigner
$_jvm_dir/bin/javac bin/javac
$_jvm_dir/bin/javadoc bin/javadoc
$_jvm_dir/bin/javah bin/javah
$_jvm_dir/bin/javap bin/javap
$_jvm_dir/bin/jcmd bin/jcmd
$_jvm_dir/bin/jdb bin/jdb
$_jvm_dir/bin/jdeprscan bin/jdeprscan
$_jvm_dir/bin/jdeps bin/jdeps
$_jvm_dir/bin/jhsdb bin/jhsdb
$_jvm_dir/bin/jimage bin/jimage
$_jvm_dir/bin/jinfo bin/jinfo
$_jvm_dir/bin/jlink bin/jlink
$_jvm_dir/bin/jmap bin/jmap
$_jvm_dir/bin/jmod bin/jmod
$_jvm_dir/bin/jps bin/jps
$_jvm_dir/bin/jrunscript bin/jrunscript
$_jvm_dir/bin/jshell bin/jshell
$_jvm_dir/bin/jstack bin/jstack
$_jvm_dir/bin/jstat bin/jstat
$_jvm_dir/bin/jstatd bin/jstatd
$_jvm_dir/bin/policytool bin/policytool
$_jvm_dir/bin/rmic bin/rmic
$_jvm_dir/bin/schemagen bin/schemagen
$_jvm_dir/bin/serialver bin/serialver
$_jvm_dir/bin/wsgen bin/wsgen
$_jvm_dir/bin/wsimport bin/wsimport
$_jvm_dir/bin/xjc bin/xjc
$_jvm_dir/include"
TERMUX_SUBPKG_DEPENDS="openjdk-9-jre-headless"
TERMUX_SUBPKG_DESCRIPTION="OpenJDK Development Kit (JDK) (headless)"

4
disabled-packages/openjdk-9-jre-headless/openjdk-9-source.subpackage.sh
View File

@ -1,4 +0,0 @@
TERMUX_SUBPKG_INCLUDE="$_jvm_dir/src.zip"
TERMUX_SUBPKG_DEPENDS="openjdk-9-jre-headless"
TERMUX_SUBPKG_DESCRIPTION="OpenJDK Development Kit (JDK) source files"
TERMUX_SUBPKG_PLATFORM_INDEPENDENT=true

12
disabled-packages/openjdk-9-jre-headless/osName.patch
View File

@ -1,12 +0,0 @@
thanks @fornwall for finding this
--- ./jdk/src/java.base/unix/classes/java/lang/ProcessImpl.java 2017-03-30 20:45:48.000000000 +0530
+++ ../ProcessImpl.java 2017-04-01 23:04:39.565293249 +0530
@@ -157,7 +157,7 @@
static Platform get() {
String osName = GetPropertyAction.privilegedGetProperty("os.name");
- if (osName.equals("Linux")) { return LINUX; }
+ if (osName.equals("Linux") || osName.equals("Android")) { return LINUX; }
if (osName.contains("OS X")) { return BSD; }
if (osName.equals("SunOS")) { return SOLARIS; }
if (osName.equals("AIX")) { return AIX; }

12
disabled-packages/openjdk-9-jre-headless/os_linux_aarch64.cpp.patch
View File

@ -1,12 +0,0 @@
--- ./hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp 2017-05-12 23:47:58.000000000 +0530
+++ ../os_linux_aarch64.cpp 2017-05-14 21:36:49.672414253 +0530
@@ -77,7 +77,9 @@
# include <pwd.h>
# include <poll.h>
# include <ucontext.h>
+# ifndef __ANDROID__
# include <fpu_control.h>
+# endif
#ifdef BUILTIN_SIM
#define REG_SP REG_RSP

11
disabled-packages/openjdk-9-jre-headless/sendfile64.patch
View File

@ -1,11 +0,0 @@
--- ./jdk/src/java.base/unix/native/libnio/ch/FileChannelImpl.c 2017-05-12 23:48:01.000000000 +0530
+++ ../FileChannelImpl.c 2017-05-14 22:51:02.292589382 +0530
@@ -41,8 +41,6 @@
#include <sys/sendfile.h>
#ifdef __ANDROID__
#define mmap64 mmap
-#include <sys/syscall.h>
-#define sendfile64(a,b,c,d) syscall(__NR_sendfile64, a, b, c, d);
#endif
#elif defined(_AIX)
#include <sys/socket.h>