some disabled package updates (#1018)

* openvpn: update from 2.4.2 to 2.4.1

* openjdk: update to tag 168 (aarch64 does not build)

* openjdk: remove unused patch
This commit is contained in:
Vishal Biswas 2017-05-15 18:57:45 +05:30 committed by Fredrik Fornwall
parent 7c231896e2
commit 76532e4393
10 changed files with 306 additions and 39 deletions

View File

@ -1,17 +1,15 @@
TERMUX_PKG_HOMEPAGE=http://openjdk.java.net
TERMUX_PKG_DESCRIPTION="OpenJDK 9 Java Runtime Environment (prerelease)"
_jbuild=162
_jbuild=168
_hg_tag="jdk-9+${_jbuild}"
_jvm_dir="lib/jvm/openjdk-9"
TERMUX_PKG_VERSION="9.2017.4.3"
TERMUX_PKG_VERSION="9.2017.5.12"
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"
# currently upstream has no support building for these arches on android
# this will change in the future
TERMUX_PKG_BLACKLISTED_ARCHES="aarch64 x86_64"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--disable-aot
--disable-hotspot-gtest
--disable-option-checking
--disable-warnings-as-errors
@ -20,30 +18,29 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--with-libpng=system
--with-zlib=system
--with-jdk-variant=normal
--with-jvm-variants=client
--with-jvm-variants=server
"
TERMUX_PKG_CLANG=no
TERMUX_PKG_RM_AFTER_INSTALL="$_jvm_dir/demo $_jvm_dir/sample"
_cups_ver=2.2.3
changesets=('d9c3e4f30936'
'493011dee80e'
'dc3346496843'
'0d44d05a4c96'
'3890f96e8995'
'92a38c75cd27'
'24582dd2649a'
'5e5e436543da')
changesets=('d3e4e68dc2a4'
'b2218d41edef'
'2982a1d6ecfc'
'69b4c97b87b5'
'912cf69806d5'
'5d9d2a65fb26'
'0e522ff8b9f5'
'131e25008015')
sha256sums=('36ca35e4fe90ae1b1966d9f909c108f39fe411b2e783faa49102d2088909be8e'
'9d24cab2e16c17f51d591b9786005062bee3e60e394d1b78dddbdfb01b9a5ea6'
'312204f76d4f23be09aa7121273ac791588de5c6a3c25d49b3087a6eb547bb7a'
'9ef21b7013ef2a0b0870d4741fc961d1fce0fcb91f44a1f8cdad865455583246'
'8d925111270630a171b0165b740bdd5d8d07c4aa1f9ea3caa86076b9f896d3ed'
'1fec470e1480472ec7e4ff402bc4b6de5e095cfd5f787bdc250814eb9479a3c0'
'db95a143078cdf3cefff5479c5350b678b1a779fcdcf7e066049559a537d81e1'
'115601bbce2f5d9df66ce49d4ca6f6db327f1e17865537911160f0cde919e7bf'
sha256sums=('6e38d7ff3ae082206b43973fd43c07c88d1e5b30985e0c4d8357c364f51cf66c'
'3173a9b6bc380ebdda014c512f0f88871a8ebdea3fda0d9ad350dba42a3493d6'
'ff1342410d63ccec54f3e043b74fbc0549b01260bb15170515c68a8dfb4f7b0b'
'cda559ee5cae0f8ab0c7ea19d70eaff58e7a44462786c78dfa8811f24d548aef'
'a24208276b465e64085890d7daf5c4d25eb8abf629d636477f85e8849a7c978a'
'a1b1a77118183000cf20bac7e10e7272145dc64e1120ccb4559b8df7160a48db'
'3f4517e94efb689a291dce74ac2a12e496767d417a05d7fc6c74c483f3d14cca'
'961adb3a0facfec181ff3b999b6fa079dffb1ff4a8f5607905f5ea28dcc597bf'
'66701fe15838f2c892052c913bde1ba106bbee2e0a953c955a62ecacce76885f')
reponames=(dev corba hotspot jdk jaxws jaxp langtools nashorn cups)
@ -93,17 +90,27 @@ 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 () {
bash $TERMUX_PKG_SRCDIR/configure \
--prefix=$TERMUX_PREFIX \
--openjdk-target=$TERMUX_HOST_PLATFORM \
--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-jvm-features="$JVM_FEATURES" \
$TERMUX_PKG_EXTRA_CONFIGURE_ARGS
}

View File

@ -0,0 +1,26 @@
--- ./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)

View File

@ -0,0 +1,16 @@
--- ./common/autoconf/generated-configure.sh 2017-05-12 23:47:56.000000000 +0530
+++ ../generated-configure.sh 2017-05-13 10:06:09.764530254 +0530
@@ -5195,13 +5195,7 @@
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
-<<<<<<< variant A
-DATE_WHEN_GENERATED=1493303684
->>>>>>> variant B
DATE_WHEN_GENERATED=1493884285
-####### Ancestor
-DATE_WHEN_GENERATED=1492975963
-======= end
###############################################################################
#

View File

@ -0,0 +1,11 @@
--- ./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

View File

@ -0,0 +1,47 @@
--- ./common/autoconf/generated-configure.sh 2017-04-01 23:19:09.508381398 +0530
+++ ../generated-configure.sh 2017-04-02 17:35:37.210373866 +0530
@@ -51452,7 +51452,7 @@
# Set JVM_LIBS (per os)
if test "x$OPENJDK_TARGET_OS" = xlinux; then
- JVM_LIBS="$JVM_LIBS -lm -ldl -lpthread"
+ JVM_LIBS="$JVM_LIBS -lm -lc"
elif test "x$OPENJDK_TARGET_OS" = xandroid; then
JVM_LIBS="$JVM_LIBS -lm -llog"
elif test "x$OPENJDK_TARGET_OS" = xsolaris; then
@@ -52293,7 +52293,7 @@
# Set OPENJDK_BUILD_JVM_LIBS (per os)
if test "x$OPENJDK_BUILD_OS" = xlinux; then
- OPENJDK_BUILD_JVM_LIBS="$OPENJDK_BUILD_JVM_LIBS -lm -ldl -lpthread"
+ OPENJDK_BUILD_JVM_LIBS="$OPENJDK_BUILD_JVM_LIBS -lm -lc"
elif test "x$OPENJDK_BUILD_OS" = xandroid; then
OPENJDK_BUILD_JVM_LIBS="$OPENJDK_BUILD_JVM_LIBS -lm -llog"
elif test "x$OPENJDK_BUILD_OS" = xsolaris; then
@@ -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

View File

@ -0,0 +1,148 @@
--- ./jdk/make/lib/NioLibraries.gmk 2017-03-30 20:45:48.000000000 +0530
+++ ../NioLibraries.gmk 2017-04-02 18:02:51.838192783 +0530
@@ -80,7 +80,7 @@
LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \
LIBS_unix := -ljava -lnet, \
- LIBS_linux := -lpthread $(LIBDL), \
+ LIBS_linux := -lc $(LIBDL), \
LIBS_solaris := -ljvm -lsocket -lposix4 $(LIBDL) \
-lsendfile -lc, \
LIBS_aix := $(LIBDL), \
--- ./jdk/make/lib/Lib-jdk.sctp.gmk 2017-03-30 20:45:48.000000000 +0530
+++ ../Lib-jdk.sctp.gmk 2017-04-02 18:04:18.014072129 +0530
@@ -50,7 +50,7 @@
$(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS := $(LDFLAGS_JDKLIB), \
LIBS_unix := -lnio -lnet -ljava -ljvm, \
- LIBS_linux := -lpthread $(LIBDL), \
+ LIBS_linux := -lc $(LIBDL), \
LIBS_solaris := -lsocket -lc, \
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libsctp, \
))
--- ./jdk/make/lib/Lib-jdk.jdwp.agent.gmk 2017-03-30 20:45:48.000000000 +0530
+++ ../Lib-jdk.jdwp.agent.gmk 2017-04-02 18:05:56.109871847 +0530
@@ -47,7 +47,7 @@
LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_windows := -export:jdwpTransport_OnLoad, \
- LIBS_linux := -lpthread, \
+ LIBS_linux := -lc, \
LIBS_solaris := -lnsl -lsocket -lc, \
LIBS_windows := $(JDKLIB_LIBS) ws2_32.lib, \
VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
--- ./jdk/make/lib/CoreLibraries.gmk 2017-03-30 20:45:48.000000000 +0530
+++ ../CoreLibraries.gmk 2017-04-02 18:06:45.519445303 +0530
@@ -407,7 +407,7 @@
-export:JLI_AddArgsFromEnvVar \
-export:JLI_GetAppArgIndex, \
LIBS_unix := $(LIBZ), \
- LIBS_linux := $(LIBDL) -lc -lpthread, \
+ LIBS_linux := $(LIBDL) -lc, \
LIBS_android := $(LIBDL) -lc -llog, \
LIBS_solaris := $(LIBDL) -lc, \
LIBS_aix := $(LIBDL),\
--- ./jdk/make/lib/NetworkingLibraries.gmk 2017-03-30 20:45:48.000000000 +0530
+++ ../NetworkingLibraries.gmk 2017-04-02 18:08:05.098770606 +0530
@@ -46,7 +46,7 @@
LDFLAGS_windows := -delayload:secur32.dll -delayload:iphlpapi.dll, \
LIBS_unix := -ljvm -ljava, \
LIBS_android := -llog, \
- LIBS_linux := $(LIBDL) -lpthread, \
+ LIBS_linux := -lc, \
LIBS_solaris := -lnsl -lsocket $(LIBDL) -lc, \
LIBS_aix := $(LIBDL),\
LIBS_windows := ws2_32.lib jvm.lib secur32.lib iphlpapi.lib winhttp.lib \
--- ./jdk/make/launcher/LauncherCommon.gmk 2017-03-30 20:45:48.000000000 +0530
+++ ../LauncherCommon.gmk 2017-04-02 18:09:02.258294282 +0530
@@ -201,7 +201,7 @@
LIBS := $(JDKEXE_LIBS) $$($1_LIBS), \
LIBS_unix := $$($1_LIBS_unix), \
LIBS_android := -llog -ljli $(LIBDL) -lc, \
- LIBS_linux := -lpthread -ljli $(LIBDL) -lc, \
+ LIBS_linux := -ljli $(LIBDL) -lc, \
LIBS_solaris := -ljli -lthread $(LIBDL) -lc, \
LIBS_windows := $$($1_WINDOWS_JLI_LIB) \
$(SUPPORT_OUTPUTDIR)/native/java.base/libjava/java.lib advapi32.lib \
--- ./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

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; }

View File

@ -0,0 +1,12 @@
--- ./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

View File

@ -0,0 +1,11 @@
--- ./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>

View File

@ -1,10 +1,11 @@
TERMUX_PKG_HOMEPAGE=https://openvpn.net
TERMUX_PKG_DESCRIPTION="An easy-to-use, robust, and highly configurable VPN (Virtual Private Network)"
TERMUX_PKG_VERSION=2.4.1
TERMUX_PKG_VERSION=2.4.2
TERMUX_PKG_DEPENDS="openssl, liblzo, net-tools"
TERMUX_PKG_SRCURL=https://swupdate.openvpn.net/community/releases/openvpn-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=fde9e22c6df7a335d2d58c6a4d5967be76df173c766a5c51ece57fd044c76ee5
TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-plugin-auth-pam
TERMUX_PKG_SHA256=df5c4f384b7df6b08a2f6fa8a84b9fd382baf59c2cef1836f82e2a7f62f1bff9
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--disable-plugin-auth-pam
--disable-systemd
--disable-debug
--enable-iproute2