diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/ant/Makefile | 46 | ||||
| -rw-r--r-- | package/ecj/Makefile | 43 | ||||
| -rw-r--r-- | package/fastjar/Makefile | 24 | ||||
| -rw-r--r-- | package/gcj/Makefile | 45 | ||||
| -rw-r--r-- | package/jikes/Makefile | 26 | ||||
| -rw-r--r-- | package/openjdk7/Makefile | 163 | ||||
| -rw-r--r-- | package/openjdk7/files/nss.cfg | 5 | ||||
| -rw-r--r-- | package/openjdk7/patches/openadk.patch | 896 | ||||
| -rw-r--r-- | package/openjdk8/Makefile | 120 | ||||
| -rw-r--r-- | package/openjdk8/files/openadk.patch | 295 |
10 files changed, 0 insertions, 1663 deletions
diff --git a/package/ant/Makefile b/package/ant/Makefile deleted file mode 100644 index b9d989ac3..000000000 --- a/package/ant/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include $(ADK_TOPDIR)/rules.mk - -PKG_NAME:= ant -PKG_VERSION:= 1.8.4 -PKG_RELEASE:= 1 -PKG_HASH:= 5de65f7ba3f67e436ffffcdc0a73f591d1006e9fb41af8632c1f1f84d4a3e0b1 -PKG_DESCR:= java code build utility -PKG_SECTION:= dev/tools -HOST_BUILDDEP:= gcj-host -PKG_SITES:= http://archive.apache.org/dist/ant/source/ - -PKG_CFLINE_ANT:= depends on ADK_HOST_ONLY - -DISTFILES:= apache-$(PKG_NAME)-$(PKG_VERSION)-src.tar.bz2 -WRKDIST= $(WRKDIR)/apache-$(PKG_NAME)-$(PKG_VERSION) - -include $(ADK_TOPDIR)/mk/host.mk -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call HOST_template,ANT,ant,$(PKG_VERSION)-${PKG_RELEASE})) - -HOST_STYLE:= manual - -host-build: - if [ ! -f $(WRKBUILD)/lib/optional/junit-4.9b2.jar ];then \ - cd $(WRKBUILD)/lib/optional; wget http://distfiles.openadk.org/junit-4.9b2.jar; \ - fi - cp $(DL_DIR)/ecj*.jar $(WRKBUILD)/lib/optional/ecj.jar - (cd ${WRKBUILD}; \ - export ANT_OPTS="-Xms256m -Xmx256m" ;\ - export JAVA_HOME=$(STAGING_HOST_DIR)/usr/lib/jvm ;\ - export CLASSPATH=$(STAGING_HOST_DIR)/usr/lib/jvm/lib/tools.jar ;\ - export JAVAC=$(STAGING_HOST_DIR)/usr/bin/ecj ;\ - export JAVACMD=$(STAGING_HOST_DIR)/usr/bin/gij ;\ - $(BASH) ./build.sh) - -ant-hostinstall: - cd $(WRKBUILD)/dist; \ - $(CP) bin/* $(STAGING_HOST_DIR)/usr/bin ; \ - $(CP) lib/* $(STAGING_HOST_DIR)/usr/lib - -include ${ADK_TOPDIR}/mk/host-bottom.mk -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/ecj/Makefile b/package/ecj/Makefile deleted file mode 100644 index 26bace2c8..000000000 --- a/package/ecj/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include $(ADK_TOPDIR)/rules.mk - -PKG_NAME:= ecj -PKG_VERSION:= 4.9 -PKG_RELEASE:= 1 -PKG_HASH:= 9506e75b862f782213df61af67338eb7a23c35ff425d328affc65585477d34cd -PKG_DESCR:= ecj java compiler -PKG_SECTION:= dev/lang -PKG_SITES:= ftp://sourceware.org/pub/java/ - -PKG_CFLINE_ECJ:= depends on ADK_HOST_ONLY -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.jar - -include $(ADK_TOPDIR)/mk/host.mk -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call HOST_template,ECJ,ecj,$(PKG_VERSION)-${PKG_RELEASE})) - -HOST_STYLE:= manual - -ecj-hostinstall: - env LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 \ - $(STAGING_HOST_DIR)/usr/bin/gcj -lgcj -O2 -findirect-dispatch \ - -o ${STAGING_HOST_DIR}/usr/bin/ecj.native \ - --main=org.eclipse.jdt.internal.compiler.batch.Main \ - $(DL_DIR)/${PKG_NAME}-${PKG_VERSION}.jar - echo "env LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 ${STAGING_HOST_DIR}/usr/bin/ecj.native \$$@" > \ - ${STAGING_HOST_DIR}/usr/bin/ecj - chmod u+x ${STAGING_HOST_DIR}/usr/bin/ecj - # put a wrapper for java here - mv ${STAGING_HOST_DIR}/usr/bin/gij ${STAGING_HOST_DIR}/usr/bin/gij.native - echo "env LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 ${STAGING_HOST_DIR}/usr/bin/gij.native \"\$$@\"" > \ - ${STAGING_HOST_DIR}/usr/bin/hostjava - chmod u+x ${STAGING_HOST_DIR}/usr/bin/hostjava - echo "env LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 ${STAGING_HOST_DIR}/usr/bin/gij.native \"\$$@\"" > \ - ${STAGING_HOST_DIR}/usr/bin/gij - chmod u+x ${STAGING_HOST_DIR}/usr/bin/gij - -include ${ADK_TOPDIR}/mk/host-bottom.mk -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/fastjar/Makefile b/package/fastjar/Makefile deleted file mode 100644 index bb19be675..000000000 --- a/package/fastjar/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include $(ADK_TOPDIR)/rules.mk - -PKG_NAME:= fastjar -PKG_VERSION:= 0.98 -PKG_RELEASE:= 1 -PKG_HASH:= f156abc5de8658f22ee8f08d7a72c88f9409ebd8c7933e9466b0842afeb2f145 -PKG_DESCR:= fastjar utility -PKG_SECTION:= dev/tools -PKG_SITES:= http://download.savannah.gnu.org/releases/fastjar/ - -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz - -PKG_CFLINE_FASTJAR:= depends on ADK_HOST_ONLY - -include $(ADK_TOPDIR)/mk/host.mk -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call HOST_template,FASTJAR,fastjar,$(PKG_VERSION)-${PKG_RELEASE})) - -include ${ADK_TOPDIR}/mk/host-bottom.mk -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/gcj/Makefile b/package/gcj/Makefile deleted file mode 100644 index c4fdd7e06..000000000 --- a/package/gcj/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include $(ADK_TOPDIR)/rules.mk - -PKG_NAME:= gcj -PKG_VERSION:= 5.4.0 -PKG_RELEASE:= 1 -PKG_HASH:= 37089e80c3f2e9a0663d7ccc51c2a6c7dbbf3275bc1e4ed1ed3b1460cd5b3030 -PKG_DESCR:= java compiler -PKG_SECTION:= dev/lang -HOST_BUILDDEP:= zip-host -PKG_SITES:= ${MASTER_SITE_GNU:=gcc/gcc-${PKG_VERSION}/} - -PKG_CFLINE_GCJ:= depends on ADK_HOST_ONLY - -DISTFILES:= gcc-$(PKG_VERSION).tar.gz -WRKDIST= ${WRKDIR}/gcc-${PKG_VERSION} - -include $(ADK_TOPDIR)/mk/host.mk -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call HOST_template,GCJ,gcj,$(PKG_VERSION)-${PKG_RELEASE})) - -HOST_MAKE_ENV+= "JAR=no LDFLAGS=-liconv" -# http://gcc.gnu.org/bugzilla/attachment.cgi?id=30880&action=diff -HOST_CONFIGURE_ARGS:= --enable-dependency-tracking \ - --enable-java-home \ - --enable-languages=java \ - --enable-shared \ - --with-ffi \ - --with-mpc=$(STAGING_HOST_DIR) \ - --with-mpfr=$(STAGING_HOST_DIR) \ - --with-gmp=$(STAGING_HOST_DIR) \ - --disable-nls \ - --without-libiconv-prefix \ - --disable-libmudflap \ - --disable-libgomp \ - --disable-biarch \ - --disable-decimal-float \ - --disable-multilib \ - --disable-bootstrap - -include ${ADK_TOPDIR}/mk/host-bottom.mk -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/jikes/Makefile b/package/jikes/Makefile deleted file mode 100644 index 5a4bd097d..000000000 --- a/package/jikes/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include $(ADK_TOPDIR)/rules.mk - -PKG_NAME:= jikes -PKG_VERSION:= 1.22 -PKG_RELEASE:= 1 -PKG_HASH:= 0cb02c763bc441349f6d38cacd52adf762302cce3a08e269f1f75f726e6e14e3 -PKG_DESCR:= java compiler -PKG_BUILDDEP:= jikes-host -PKG_SECTION:= dev/lang -PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=jikes/Jikes/1.22/} - -PKG_CFLINE_JIKES:= depends on ADK_HOST_ONLY - -DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 - -include $(ADK_TOPDIR)/mk/host.mk -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call HOST_template,JIKES,jikes,$(PKG_VERSION)-${PKG_RELEASE})) -$(eval $(call PKG_template,JIKES,jikes,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -include ${ADK_TOPDIR}/mk/host-bottom.mk -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile deleted file mode 100644 index d757ba965..000000000 --- a/package/openjdk7/Makefile +++ /dev/null @@ -1,163 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include $(ADK_TOPDIR)/rules.mk - -PKG_NAME:= openjdk7 -PKG_VERSION:= 2.6.9 -PKG_RELEASE:= 1 -PKG_HASH:= 8e4f3eb8d41ef66f1797825343141046973c124b18bf7d4698fae0a9a25495ea -PKG_DESCR:= java virtual machine -PKG_SECTION:= dev/lang -PKG_BUILDDEP:= openjdk7-host alsa-lib xproto libjpeg-turbo zlib giflib libpng freetype cups -PKG_BUILDDEP+= libX11 libXt libXp libXinerama libXrender libXtst -PKG_BUILDDEP+= libpng giflib libgtk2 glib fontconfig nss gconf ncurses -HOST_BUILDDEP:= fastjar-host gcj-host ecj-host unzip-host ant-host libXcomposite-host -HOST_BUILDDEP+= libXtst-host libXt-host libXinerama-host libXrender-host -HOST_BUILDDEP+= cups-host qemu-host alsa-lib-host freetype-host libxslt-host -PKG_DEPENDS:= zlib libffi libxtst libxi cups gconf -PKG_DEPENDS+= libfreetype libxrender libx11 libxext nss libjpeg-turbo -PKG_DEPENDS+= libpng giflib libgtk2 glib fontconfig libncurses -PKG_NEEDS:= threads c++ -PKG_URL:= http://openjdk.org/ -PKG_SITES:= http://icedtea.classpath.org/download/source/ - -DISTFILES:= icedtea-$(PKG_VERSION).tar.xz -WRKDIST= ${WRKDIR}/icedtea-${PKG_VERSION} - -GCJ_VER:= 5.4.0 - -PKG_HOST_DEPENDS:= linux -PKG_ARCH_DEPENDS:= arm mips ppc x86 x86_64 - -include $(ADK_TOPDIR)/mk/host.mk -include $(ADK_TOPDIR)/mk/package.mk -include $(ADK_TOPDIR)/mk/qemu.mk - -$(eval $(call HOST_template,OPENJDK7,openjdk7,$(PKG_VERSION)-${PKG_RELEASE})) -$(eval $(call PKG_template,OPENJDK7,openjdk7,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -CONFIG_STYLE:= basic - -# uclibc with iconv-tiny/libiconv needs -liconv -ifeq ($(ADK_TARGET_LIBC_ICONV),) -ifeq ($(ADK_TARGET_LIB_UCLIBC_NG),y) -TARGET_LIBS:= -liconv -lm -endif -endif - -# for UINTPTR_MAX in stdint.h -TARGET_CFLAGS+= -D__STDC_LIMIT_MACROS -# segfaults with march=pentium-m/atom -TARGET_CFLAGS:= $(subst march=pentium-m,march=i686,$(TARGET_CFLAGS)) -TARGET_CFLAGS:= $(subst march=atom,march=i686,$(TARGET_CFLAGS)) - -BOOTSTRAPJDK:= ${STAGING_HOST_DIR}/bootstrap-jdk - -JDKARCH:= $(ADK_TARGET_CPU_ARCH) -ifeq ($(ADK_TARGET_ARCH),x86) -JDKARCH:= i386 -endif -ifeq ($(ADK_TARGET_CPU_ARCH),x86_64) -JDKARCH:= amd64 -endif - -CONFIGURE_ARGS:= --enable-zero \ - --disable-docs \ - --with-jdk-home=$(BOOTSTRAPJDK) \ - --with-java=$(BOOTSTRAPJDK)/bin/java \ - --with-javac=$(BOOTSTRAPJDK)/bin/javac \ - --with-javah=$(BOOTSTRAPJDK)/bin/javah \ - --with-jar=$(BOOTSTRAPJDK)/bin/jar \ - --with-rmic=$(BOOTSTRAPJDK)/bin/rmic \ - --with-native2ascii=$(BOOTSTRAPJDK)/bin/native2ascii \ - --without-gcj \ - --without-hotspot-build \ - --enable-nss \ - --enable-system-zlib \ - --enable-system-jpeg \ - --enable-system-png \ - --enable-system-gif \ - --enable-system-gtk \ - --enable-system-gio \ - --enable-system-fontconfig \ - --enable-system-gconf \ - --disable-system-sctp \ - --disable-system-pcsc \ - --disable-system-lcms \ - --disable-system-kerberos \ - --disable-compile-against-syscalls \ - --without-rhino \ - --disable-bootstrap - -CONFIGURE_ENV+= LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib -MAKE_ENV+= ALT_COMPILER_PATH=$(TOOLCHAIN_DIR)/usr/$(GNU_TARGET_NAME)/bin \ - ALT_OPENWIN_HOME=$(STAGING_TARGET_DIR)/usr/ \ - ALT_CUPS_HEADERS_PATH=$(STAGING_TARGET_DIR)/usr/include/ \ - ALT_FREETYPE_HEADERS_PATH=$(STAGING_TARGET_DIR)/usr/include/ \ - OTHER_CFLAGS='$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)' \ - OTHER_CXXFLAGS='$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)' \ - OTHER_LDFLAGS='$(TARGET_LDFLAGS)' \ - OTHER_LDLIBS='$(TARGET_LIBS)' \ - NO_DOCS=true \ - CROSS_COMPILE_ARCH=$(JDKARCH) QEMU=$(QEMU) \ - LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib - -ALL_TARGET:= icedtea - -# host stuff -OPENJDK_NATIVE_ENV:= JAVACFLAGS="-cp ${STAGING_HOST_DIR}/usr/share/java/libgcj-$(GCJ_VER).jar" \ - NO_DOCS=true \ - LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 \ - BOOTCLASSPATH="$(STAGING_HOST_DIR)/usr/share/jamvm/classes.zip:$(STAGING_HOST_DIR)/usr/share/classpath/glibj.zip" \ - OTHER_CPPFLAGS='$(HOST_CPPFLAGS)' \ - OTHER_LDFLAGS='$(HOST_LDFLAGS)' \ - ALSA_CPPFLAGS='$(HOST_CPPFLAGS)' \ - LIBFFI_CFLAGS='-I$(STAGING_HOST_DIR)/usr/include -L$(STAGING_HOST_DIR)/usr/lib' \ - ALT_OPENWIN_HOME='$(STAGING_HOST_DIR)/usr' \ - ALT_CUPS_HEADERS_PATH="$(STAGING_HOST_DIR)/usr/include" \ - ALT_FREETYPE_HEADERS_PATH="$(STAGING_HOST_DIR)/usr/include" \ - ALT_FREETYPE_LIB_PATH="$(STAGING_HOST_DIR)/usr/lib" - -HOST_CONFIGURE_ENV+= $(OPENJDK_NATIVE_ENV) -HOST_MAKE_ENV+= $(OPENJDK_NATIVE_ENV) -HOST_ALL_TARGET:= icedtea-boot -HOST_CONFIGURE_ARGS+= --enable-bootstrap \ - --enable-zero \ - --with-jdk-home=$(STAGING_HOST_DIR)/usr/lib/jvm \ - --with-java=$(STAGING_HOST_DIR)/usr/bin/hostjava \ - --with-javac=$(STAGING_HOST_DIR)/usr/bin/ecj \ - --with-ecj-jar=${DL_DIR}/ecj-4.9.jar \ - --without-hotspot-build \ - --disable-system-zlib \ - --disable-system-jpeg \ - --disable-system-lcms \ - --disable-system-png \ - --disable-system-gif \ - --disable-system-gtk \ - --disable-system-gio \ - --disable-system-kerberos \ - --disable-system-fontconfig \ - --disable-system-gconf \ - --disable-system-pcsc \ - --disable-system-sctp \ - --disable-compile-against-syscalls \ - --without-rhino \ - --enable-systemtap=no \ - --disable-docs - -hostpost-install: - -rm -rf $(STAGING_HOST_DIR)/bootstrap-jdk - $(CP) $(WRKBUILD)/openjdk.build-boot/j2sdk-image $(STAGING_HOST_DIR)/bootstrap-jdk - -openjdk7-install: - $(INSTALL_DIR) $(IDIR_OPENJDK7)/usr/lib/jvm/jre - $(INSTALL_DIR) $(IDIR_OPENJDK7)/usr/bin - $(CP) $(WRKBUILD)/openjdk.build/j2re-image/bin $(IDIR_OPENJDK7)/usr/lib/jvm/jre - $(CP) $(WRKBUILD)/openjdk.build/j2re-image/lib $(IDIR_OPENJDK7)/usr/lib/jvm/jre - (cd $(IDIR_OPENJDK7)/usr/bin && ln -sf ../lib/jvm/jre/bin/java .) - (cd $(IDIR_OPENJDK7)/usr/lib/jvm/jre/lib/$(JDKARCH) && ln -sf server/libjvm.so .) - $(CP) ./files/nss.cfg $(IDIR_OPENJDK7)/usr/lib/jvm/jre/lib/security - -include ${ADK_TOPDIR}/mk/host-bottom.mk -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/openjdk7/files/nss.cfg b/package/openjdk7/files/nss.cfg deleted file mode 100644 index e0685918b..000000000 --- a/package/openjdk7/files/nss.cfg +++ /dev/null @@ -1,5 +0,0 @@ -name = NSS -nssLibraryDirectory = /usr/lib -nssDbMode = noDb -attributes = compatibility -handleStartupErrors = ignoreMultipleInitialisation diff --git a/package/openjdk7/patches/openadk.patch b/package/openjdk7/patches/openadk.patch deleted file mode 100644 index 276f1fc79..000000000 --- a/package/openjdk7/patches/openadk.patch +++ /dev/null @@ -1,896 +0,0 @@ -diff -Nur icedtea-2.6.9.orig/Makefile.in icedtea-2.6.9/Makefile.in ---- icedtea-2.6.9.orig/Makefile.in 2017-02-14 01:37:03.478827012 +0100 -+++ icedtea-2.6.9/Makefile.in 2017-04-02 07:50:37.977789464 +0200 -@@ -647,7 +647,6 @@ - STAGE1_BOOT_DIR = $(abs_top_builddir)/bootstrap/boot - STAGE2_BOOT_DIR = $(abs_top_builddir)/bootstrap/icedtea - JAMVM_IMPORT_PATH = $(abs_top_builddir)/jamvm/install/hotspot --CRYPTO_CHECK_BUILD_DIR = $(abs_top_builddir)/test/cryptocheck.build - ECC_CHECK_BUILD_DIR = $(abs_top_builddir)/ecccheck.build - MIME_TYPE_CHECK_BUILD_DIR = $(abs_top_builddir)/test/mimetypecheck.build - STAGE1_BOOT_RUNTIME = $(STAGE1_BOOT_DIR)/jre/lib/rt.jar -@@ -791,7 +790,7 @@ - $(am__append_14) $(DISTRIBUTION_PATCHES) - - # Bootstrapping patches --ICEDTEA_BOOT_PATCHES = patches/boot/javafiles.patch \ -+ICEDTEA_BOOT_PATCHES = patches/openadk.patch patches/boot/javafiles.patch \ - patches/boot/corba-idlj.patch patches/boot/corba-no-gen.patch \ - patches/boot/corba-orb.patch patches/boot/demos.patch \ - patches/boot/fphexconstants.patch \ -@@ -1512,7 +1511,7 @@ - clean-icedtea-debug-stage2 clean-icedtea-stage1 clean-add-zero clean-add-zero-debug \ - clean-add-cacao clean-add-cacao-debug clean-rt clean-rewrite-rhino clean-rewriter \ - clean-add-systemtap clean-add-systemtap-debug clean-add-nss clean-add-tzdata-support \ -- clean-add-tzdata-support-debug clean-cryptocheck clean-policytool-@JAVA_VER@.desktop \ -+ clean-add-tzdata-support-debug clean-policytool-@JAVA_VER@.desktop \ - clean-jconsole-@JAVA_VER@.desktop clean-ecccheck clean-mimetypecheck - if [ -e bootstrap ]; then \ - rmdir bootstrap ; \ -@@ -1545,8 +1544,7 @@ - clean-add-systemtap-debug clean-add-systemtap-boot \ - clean-add-nss clean-add-tzdata-support clean-add-tzdata-support-debug \ - clean-add-tzdata-support-boot clean-check-mimetype clean-mimetypecheck \ -- clean-check-crypto clean-check-crypto-debug clean-check-crypto-boot \ -- clean-add-archive clean-add-archive-debug clean-add-archive-boot clean-cryptocheck \ -+ clean-add-archive clean-add-archive-debug clean-add-archive-boot \ - clean-download-hotspot clean-download-corba clean-download-jaxp \ - clean-download-jaxws clean-download-langtools clean-download-jdk clean-download-openjdk \ - clean-extract-corba clean-extract-jaxp clean-extract-jaxws clean-extract-jdk \ -@@ -2533,16 +2531,6 @@ - fi - rm -f stamps/add-tzdata-support.stamp - --stamps/check-crypto.stamp: stamps/cryptocheck.stamp stamps/icedtea.stamp -- if [ -e $(BUILD_SDK_DIR)/bin/java ] ; then \ -- $(BUILD_SDK_DIR)/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \ -- fi -- mkdir -p stamps -- touch $@ -- --clean-check-crypto: -- rm -f stamps/check-crypto.stamp -- - stamps/add-archive.stamp: stamps/icedtea.stamp - @ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@ if [ -e $(BUILD_SDK_DIR)/bin/java ] ; then \ - @ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@ if test "x$(INSTALL_ARCH_DIR)" != "xppc64" -a "x$(INSTALL_ARCH_DIR)" != "xppc64le" ; then \ -@@ -2657,16 +2645,6 @@ - fi - rm -f stamps/add-tzdata-support-debug.stamp - --stamps/check-crypto-debug.stamp: stamps/cryptocheck.stamp stamps/icedtea-debug.stamp -- if [ -e $(BUILD_DEBUG_SDK_DIR)/bin/java ] ; then \ -- $(BUILD_DEBUG_SDK_DIR)/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \ -- fi -- mkdir -p stamps -- touch $@ -- --clean-check-crypto-debug: -- rm -f stamps/check-crypto-debug.stamp -- - stamps/add-archive-debug.stamp: stamps/icedtea-debug.stamp - @ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@ if [ -e $(BUILD_DEBUG_SDK_DIR)/bin/java ] ; then \ - @ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@ if test "x$(INSTALL_ARCH_DIR)" != "xppc64" -a "x$(INSTALL_ARCH_DIR)" != "xppc64le" ; then \ -@@ -2711,24 +2689,24 @@ - - stamps/icedtea-stage2.stamp: stamps/icedtea.stamp stamps/add-cacao.stamp \ - stamps/add-zero.stamp stamps/add-jamvm.stamp stamps/add-systemtap.stamp \ -- stamps/add-tzdata-support.stamp stamps/check-crypto.stamp stamps/add-archive.stamp \ -+ stamps/add-tzdata-support.stamp stamps/add-archive.stamp \ - stamps/split-debuginfo.stamp stamps/add-mime-types-file.stamp - mkdir -p stamps - touch $@ - --clean-icedtea-stage2: clean-add-jamvm clean-check-crypto clean-add-archive clean-split-debuginfo \ -+clean-icedtea-stage2: clean-add-jamvm clean-add-archive clean-split-debuginfo \ - clean-add-mime-types-file - rm -f stamps/icedtea-stage2.stamp - - stamps/icedtea-debug-stage2.stamp: stamps/icedtea-debug.stamp \ - stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp stamps/add-jamvm-debug.stamp \ - stamps/add-systemtap-debug.stamp stamps/add-tzdata-support-debug.stamp \ -- stamps/check-crypto-debug.stamp stamps/add-archive-debug.stamp stamps/split-debuginfo-debug.stamp \ -+ stamps/add-archive-debug.stamp stamps/split-debuginfo-debug.stamp \ - stamps/add-mime-types-file-debug.stamp - mkdir -p stamps - touch $@ - --clean-icedtea-debug-stage2: clean-add-jamvm-debug clean-check-crypto-debug \ -+clean-icedtea-debug-stage2: clean-add-jamvm-debug \ - clean-add-archive-debug clean-split-debuginfo-debug clean-add-mime-types-file-debug - rm -f stamps/icedtea-debug-stage2.stamp - -@@ -2799,16 +2777,6 @@ - fi - rm -f stamps/add-tzdata-support-boot.stamp - --stamps/check-crypto-boot.stamp: stamps/cryptocheck.stamp stamps/icedtea-boot.stamp -- if [ -e $(BUILD_BOOT_SDK_DIR)/bin/java ] ; then \ -- $(BUILD_BOOT_SDK_DIR)/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \ -- fi -- mkdir -p stamps -- touch $@ -- --clean-check-crypto-boot: -- rm -f stamps/check-crypto-boot.stamp -- - stamps/add-archive-boot.stamp: stamps/icedtea-boot.stamp - @ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@ if [ -e $(BUILD_BOOT_SDK_DIR)/bin/java ] ; then \ - @ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@ if test "x$(INSTALL_ARCH_DIR)" != "xppc64" -a "x$(INSTALL_ARCH_DIR)" != "xppc64le" ; then \ -@@ -2853,13 +2821,13 @@ - - stamps/icedtea-stage1.stamp: stamps/icedtea-boot.stamp \ - stamps/add-systemtap-boot.stamp stamps/add-tzdata-support-boot.stamp \ -- stamps/check-crypto-boot.stamp stamps/add-archive-boot.stamp \ -+ stamps/add-archive-boot.stamp \ - stamps/split-debuginfo-boot.stamp stamps/add-mime-types-file-boot.stamp - mkdir -p stamps - touch $@ - - clean-icedtea-stage1: clean-add-systemtap-boot clean-add-tzdata-support-boot \ -- clean-check-crypto-boot clean-add-archive-boot clean-split-debuginfo-boot \ -+ clean-add-archive-boot clean-split-debuginfo-boot \ - clean-add-mime-types-file-boot - rm -f stamps/icedtea-stage1.stamp - -@@ -2940,7 +2908,7 @@ - stamps/jamvm.stamp: $(OPENJDK_TREE) stamps/rt.stamp - @BUILD_JAMVM_TRUE@ cd jamvm/jamvm && \ - @BUILD_JAMVM_TRUE@ ./autogen.sh --with-java-runtime-library=openjdk7 \ --@BUILD_JAMVM_TRUE@ --prefix=$(abs_top_builddir)/jamvm/install ; \ -+@BUILD_JAMVM_TRUE@ --prefix=$(abs_top_builddir)/jamvm/install $(CONFIGURE_ARGS); \ - @BUILD_JAMVM_TRUE@ $(MAKE) ; \ - @BUILD_JAMVM_TRUE@ $(MAKE) install - @BUILD_JAMVM_TRUE@ mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server -@@ -3323,19 +3291,6 @@ - chmod u+w $(STAGE1_BOOT_RUNTIME) ; \ - fi - --# Crypto Level Check -- --stamps/cryptocheck.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) -- mkdir -p $(CRYPTO_CHECK_BUILD_DIR) -- $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \ -- -d $(CRYPTO_CHECK_BUILD_DIR) $(CRYPTO_CHECK_SRCS) -- mkdir -p stamps -- touch $@ -- --clean-cryptocheck: -- rm -rf $(CRYPTO_CHECK_BUILD_DIR) -- rm -f stamps/cryptocheck.stamp -- - # Mime Type Check - - stamps/mimetypecheck.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) -@@ -3422,7 +3377,6 @@ - ${mkinstalldirs} $(DESTDIR)${prefix}/jre/bin $(DESTDIR)${prefix}/jre/lib - ${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/{.,headless,jli,xawt} - ${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/ext -- ${mkinstalldirs} $(DESTDIR)${prefix}/tapset - @SPLIT_DEBUGINFO_TRUE@ ${mkinstalldirs} $(DESTDIR)$(DEBUG_PREFIX)/$(bindir) $(DESTDIR)$(DEBUG_PREFIX)/${exec_prefix}/lib - @SPLIT_DEBUGINFO_TRUE@ ${mkinstalldirs} $(DESTDIR)$(DEBUG_PREFIX)/${exec_prefix}/lib/$(INSTALL_ARCH_DIR) - @SPLIT_DEBUGINFO_TRUE@ ${mkinstalldirs} $(DESTDIR)$(DEBUG_PREFIX)/${exec_prefix}/lib/$(INSTALL_ARCH_DIR)/jli -@@ -3520,9 +3474,6 @@ - for files in $(BUILD_SDK_DIR)/jre/lib/ext/*.jar; do \ - $(call install_file,$${files},$(DESTDIR)${prefix}/jre/lib/ext,$(INSTALL_DATA));\ - done -- for files in $(BUILD_SDK_DIR)/tapset/*.stp; do \ -- $(call install_file,$${files},$(DESTDIR)${prefix}/tapset,$(INSTALL_DATA));\ -- done - $(abs_top_builddir)/pax-mark-vm $(DESTDIR)${prefix} false - - install-data-local: -@@ -3687,12 +3638,6 @@ - - cacao: stamps/cacao.stamp - --check-crypto: stamps/check-crypto.stamp -- --check-crypto-boot: stamps/check-crypto-boot.stamp -- --check-crypto-debug: stamps/check-crypto-debug.stamp -- - check-mimetype: stamps/check-mimetype.stamp - - check-ecc: stamps/check-ecc.stamp -@@ -3703,8 +3648,6 @@ - - clone-boot: stamps/clone-boot.stamp - --cryptocheck: stamps/cryptocheck.stamp -- - download: stamps/download.stamp - - download-cacao: stamps/download-cacao.stamp -diff -Nur icedtea-2.6.9.orig/patches/openadk.patch icedtea-2.6.9/patches/openadk.patch ---- icedtea-2.6.9.orig/patches/openadk.patch 1970-01-01 01:00:00.000000000 +0100 -+++ icedtea-2.6.9/patches/openadk.patch 2017-04-01 21:44:15.574904720 +0200 -@@ -0,0 +1,688 @@ -+diff -Nur openjdk.orig/corba/make/common/shared/Defs-utils.gmk openjdk/corba/make/common/shared/Defs-utils.gmk -+--- openjdk.orig/corba/make/common/shared/Defs-utils.gmk 2017-02-07 05:06:20.000000000 +0100 -++++ openjdk/corba/make/common/shared/Defs-utils.gmk 2017-04-01 21:43:13.128492754 +0200 -+@@ -136,12 +136,12 @@ -+ TRUE = $(UTILS_COMMAND_PATH)true -+ UNAME = $(UTILS_COMMAND_PATH)uname -+ UNIQ = $(UTILS_USR_BIN_PATH)uniq -+-UNZIP = $(UTILS_USR_BIN_PATH)unzip -+-UNZIPSFX = $(UTILS_DEVTOOL_PATH)unzipsfx -++UNZIP = unzip -++UNZIPSFX = unzipsfx -+ WC = $(UTILS_USR_BIN_PATH)wc -+ WHICH = $(UTILS_USR_BIN_PATH)which -+ YACC = $(UTILS_CCS_BIN_PATH)yacc -+-ZIPEXE = $(UTILS_DEVTOOL_PATH)zip -++ZIPEXE = zip -+ -+ # Special cases -+ #RM is defined by GNU Make as 'rm -f' -+diff -Nur openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make -+--- openjdk.orig/hotspot/make/linux/makefiles/gcc.make 2017-02-07 05:06:40.000000000 +0100 -++++ openjdk/hotspot/make/linux/makefiles/gcc.make 2017-04-01 21:43:13.128492754 +0200 -+@@ -77,7 +77,7 @@ -+ VM_PICFLAG = $(VM_PICFLAG/$(LINK_INTO)) -+ -+ ifeq ($(TYPE),ZERO) -+-CFLAGS += $(LIBFFI_CFLAGS) -++CFLAGS += $(LIBFFI_CFLAGS) -Wl,-Bstatic $(LIBFFI_LIBS) -Wl,-Bdynamic -+ endif -+ ifeq ($(TYPE),SHARK) -+ CFLAGS += $(LIBFFI_CFLAGS) -+diff -Nur openjdk.orig/hotspot/make/linux/makefiles/vm.make openjdk/hotspot/make/linux/makefiles/vm.make -+--- openjdk.orig/hotspot/make/linux/makefiles/vm.make 2017-02-07 05:06:40.000000000 +0100 -++++ openjdk/hotspot/make/linux/makefiles/vm.make 2017-04-01 21:43:13.128492754 +0200 -+@@ -301,27 +301,9 @@ -+ LIBJVM_MAPFILE$(LDNOMAP) = mapfile_reorder -+ LFLAGS_VM$(LDNOMAP) += $(MAPFLAG:FILENAME=$(LIBJVM_MAPFILE)) -+ LFLAGS_VM += $(SONAMEFLAG:SONAME=$(LIBJVM)) -+- -+- # JVM is statically linked with libgcc[_s] and libstdc++; this is needed to -+- # get around library dependency and compatibility issues. Must use gcc not -+- # g++ to link. -+- ifeq ($(STATIC_CXX), true) -+- LFLAGS_VM += $(STATIC_LIBGCC) -+- LIBS_VM += $(STATIC_STDCXX) -+- else -+- LIBS_VM += -lstdc++ -+- endif -+- -+- LIBS_VM += $(LIBS) -+-endif -+-ifeq ($(TYPE),ZERO) -+- LIBS_VM += $(LIBFFI_LIBS) -+-endif -+-ifeq ($(TYPE),SHARK) -+- LIBS_VM += $(LIBFFI_LIBS) $(LLVM_LIBS) -+- LFLAGS_VM += $(LLVM_LDFLAGS) -+ endif -+ -++LIBS_VM = $(LIBS) -lstdc++ $(LIBFFI_CFLAGS) -Wl,-Bstatic $(LIBFFI_LIBS) -Wl,-Bdynamic -+ LINK_VM = $(LINK_LIB.CC) -+ -+ # rule for building precompiled header -+@@ -358,6 +340,7 @@ -+ $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) $(LD_SCRIPT) -+ $(QUIETLY) { \ -+ echo Linking vm...; \ -++ echo DEBUG: $(LIBS_VM); \ -+ $(LINK_LIB.CXX/PRE_HOOK) \ -+ $(LINK_VM) $(LD_SCRIPT_FLAG) \ -+ $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM); \ -+diff -Nur openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make -+--- openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make 2017-02-07 05:06:40.000000000 +0100 -++++ openjdk/hotspot/make/linux/makefiles/zeroshark.make 2017-04-01 21:43:13.128492754 +0200 -+@@ -39,20 +39,20 @@ -+ -+ offsets_arm.s: mkoffsets -+ @echo Generating assembler offsets -+- ./mkoffsets > $@ -++ $(QEMU) ./mkoffsets > $@ -+ -+ bytecodes_arm.s: bytecodes_arm.def mkbc -+ @echo Generating ARM assembler bytecode sequences -+- $(CXX_COMPILE) -E -x c++ - < $< | ./mkbc - $@ $(COMPILE_DONE) -++ $(CXX_COMPILE) -E -x c++ - < $< | $(QEMU) ./mkbc - $@ $(COMPILE_DONE) -+ -+ mkbc: $(GAMMADIR)/tools/mkbc.c -+ @echo Compiling mkbc tool -+- $(CC_COMPILE) -o $@ $< $(COMPILE_DONE) -++ $(CC_COMPILE) -static -o $@ $< $(COMPILE_DONE) -+ -+ mkoffsets: asm_helper.cpp -+ @echo Compiling offset generator -+ $(QUIETLY) $(REMOVE_TARGET) -+- $(CXX_COMPILE) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE) -++ $(CXX_COMPILE) -Wl,-static -static -static-libstdc++ -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE) -+ -+ endif -+ endif -+diff -Nur openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp -+--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp 2017-02-07 05:06:40.000000000 +0100 -++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2017-04-01 21:43:13.132492910 +0200 -+@@ -116,7 +116,6 @@ -+ # include <string.h> -+ # include <syscall.h> -+ # include <sys/sysinfo.h> -+-# include <gnu/libc-version.h> -+ # include <sys/ipc.h> -+ # include <sys/shm.h> -+ # include <link.h> -+@@ -674,9 +673,7 @@ -+ os::Linux::set_glibc_version(str); -+ } else { -+ // _CS_GNU_LIBC_VERSION is not supported, try gnu_get_libc_version() -+- static char _gnu_libc_version[32]; -+- jio_snprintf(_gnu_libc_version, sizeof(_gnu_libc_version), -+- "glibc %s %s", gnu_get_libc_version(), gnu_get_libc_release()); -++ static char _gnu_libc_version[32] = "2.9"; -+ os::Linux::set_glibc_version(_gnu_libc_version); -+ } -+ -+@@ -2977,10 +2974,7 @@ -+ // If we are running with earlier version, which did not have symbol versions, -+ // we should use the base version. -+ void* os::Linux::libnuma_dlsym(void* handle, const char *name) { -+- void *f = dlvsym(handle, name, "libnuma_1.1"); -+- if (f == NULL) { -+- f = dlsym(handle, name); -+- } -++ void *f = dlsym(handle, name); -+ return f; -+ } -+ -+@@ -5665,7 +5659,21 @@ -+ // Linux doesn't yet have a (official) notion of processor sets, -+ // so just return the system wide load average. -+ int os::loadavg(double loadavg[], int nelem) { -+- return ::getloadavg(loadavg, nelem); -++ FILE *LOADAVG; -++ double avg[3] = { 0.0, 0.0, 0.0 }; -++ int i, res = -1;; -++ -++ if ((LOADAVG = fopen("/proc/loadavg", "r"))) { -++ fscanf(LOADAVG, "%lf %lf %lf", &avg[0], &avg[1], &avg[2]); -++ res = 0; -++ fclose(LOADAVG); -++ } -++ -++ for (i = 0; (i < nelem) && (i < 3); i++) { -++ loadavg[i] = avg[i]; -++ } -++ -++ return res; -+ } -+ -+ void os::pause() { -+diff -Nur openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp -+--- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp 2017-02-07 05:06:40.000000000 +0100 -++++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp 2017-04-01 21:43:13.132492910 +0200 -+@@ -36,7 +36,7 @@ -+ -+ // Atomically copy 64 bits of data -+ static void atomic_copy64(volatile void *src, volatile void *dst) { -+-#if defined(PPC32) -++#if defined(PPC32) && !defined(__NO_FPRS__) -+ double tmp; -+ asm volatile ("lfd %0, 0(%1)\n" -+ "stfd %0, 0(%2)\n" -+diff -Nur openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp -+--- openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2017-02-07 05:06:40.000000000 +0100 -++++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2017-04-01 21:43:13.132492910 +0200 -+@@ -245,7 +245,7 @@ -+ #elif defined(__APPLE__) -+ inline int g_isnan(double f) { return isnan(f); } -+ #elif defined(LINUX) || defined(_ALLBSD_SOURCE) -+-inline int g_isnan(float f) { return isnanf(f); } -++inline int g_isnan(float f) { return __isnanf(f); } -+ inline int g_isnan(double f) { return isnan(f); } -+ #else -+ #error "missing platform-specific definition here" -+@@ -259,8 +259,8 @@ -+ -+ // Checking for finiteness -+ -+-inline int g_isfinite(jfloat f) { return finite(f); } -+-inline int g_isfinite(jdouble f) { return finite(f); } -++inline int g_isfinite(jfloat f) { return isfinite(f); } -++inline int g_isfinite(jdouble f) { return isfinite(f); } -+ -+ -+ // Wide characters -+diff -Nur openjdk.orig/jdk/make/com/sun/java/pack/Makefile openjdk/jdk/make/com/sun/java/pack/Makefile -+--- openjdk.orig/jdk/make/com/sun/java/pack/Makefile 2017-02-13 04:45:45.000000000 +0100 -++++ openjdk/jdk/make/com/sun/java/pack/Makefile 2017-04-01 21:43:13.132492910 +0200 -+@@ -80,7 +80,7 @@ -+ OTHER_CXXFLAGS += $(ZLIB_CFLAGS) -DSYSTEM_ZLIB -+ endif -+ else -+- OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI -++ CXXFLAGS_COMMON += -DNO_ZLIB -DUNPACK_JNI -+ OTHER_LDLIBS += $(JVMLIB) -+ endif -+ -+diff -Nur openjdk.orig/jdk/make/com/sun/nio/sctp/Makefile openjdk/jdk/make/com/sun/nio/sctp/Makefile -+--- openjdk.orig/jdk/make/com/sun/nio/sctp/Makefile 2017-02-13 04:45:45.000000000 +0100 -++++ openjdk/jdk/make/com/sun/nio/sctp/Makefile 2017-04-01 21:43:13.132492910 +0200 -+@@ -75,8 +75,8 @@ -+ ifneq ($(COMPILER_WARNINGS_FATAL),false) -+ COMPILER_WARNINGS_FATAL=true -+ endif -+-#OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl -+-OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -lnio -lnet -lpthread -++#OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet -lpthread -ldl -++OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -lnio -ljavanet -lpthread -+ endif -+ ifeq ($(PLATFORM), solaris) -+ #LIBSCTP = -lsctp -+diff -Nur openjdk.orig/jdk/make/common/Defs.gmk openjdk/jdk/make/common/Defs.gmk -+--- openjdk.orig/jdk/make/common/Defs.gmk 2017-02-13 04:45:45.000000000 +0100 -++++ openjdk/jdk/make/common/Defs.gmk 2017-04-01 21:43:13.132492910 +0200 -+@@ -207,7 +207,7 @@ -+ ifeq ($(PLATFORM), macosx) -+ FREETYPE_HEADERS_PATH = /usr/X11R6/include -+ else -+- FREETYPE_HEADERS_PATH = /usr/include -++ FREETYPE_HEADERS_PATH = /usr/include/disabled -+ endif -+ endif -+ endif -+diff -Nur openjdk.orig/jdk/make/common/Sanity.gmk openjdk/jdk/make/common/Sanity.gmk -+--- openjdk.orig/jdk/make/common/Sanity.gmk 2017-02-13 04:45:45.000000000 +0100 -++++ openjdk/jdk/make/common/Sanity.gmk 2017-04-01 21:43:13.132492910 +0200 -+@@ -91,8 +91,7 @@ -+ sane-ld_run_path \ -+ sane-alt_bootdir \ -+ sane-bootdir \ -+- sane-local-bootdir \ -+- sane-alsa-headers -++ sane-local-bootdir -+ -+ ifdef OPENJDK -+ sanity-all:: sane-freetype -+diff -Nur openjdk.orig/jdk/make/common/shared/Defs-utils.gmk openjdk/jdk/make/common/shared/Defs-utils.gmk -+--- openjdk.orig/jdk/make/common/shared/Defs-utils.gmk 2017-02-13 04:45:45.000000000 +0100 -++++ openjdk/jdk/make/common/shared/Defs-utils.gmk 2017-04-01 21:43:13.132492910 +0200 -+@@ -157,13 +157,13 @@ -+ TRUE = $(UTILS_COMMAND_PATH)true -+ UNAME = $(UTILS_COMMAND_PATH)uname -+ UNIQ = $(UTILS_USR_BIN_PATH)uniq -+-UNZIP = $(UTILS_USR_BIN_PATH)unzip -+-UNZIPSFX = $(UTILS_DEVTOOL_PATH)unzipsfx -++UNZIP = unzip -++UNZIPSFX = unzipsfx -+ XARGS = $(UTILS_USR_BIN_PATH)xargs -+ WC = $(UTILS_USR_BIN_PATH)wc -+ WHICH = $(UTILS_USR_BIN_PATH)which -+ YACC = $(UTILS_CCS_BIN_PATH)yacc -+-ZIPEXE = $(UTILS_DEVTOOL_PATH)zip -++ZIPEXE = zip -+ -+ # Special cases -+ #RM is defined by GNU Make as 'rm -f' -+diff -Nur openjdk.orig/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk -+--- openjdk.orig/jdk/make/common/shared/Platform.gmk 2017-02-13 04:45:45.000000000 +0100 -++++ openjdk/jdk/make/common/shared/Platform.gmk 2017-04-01 21:43:13.132492910 +0200 -+@@ -170,9 +170,6 @@ -+ else -+ mach := $(shell uname -m) -+ endif -+- ifneq (,$(wildcard /usr/bin/dpkg-architecture)) -+- mach := $(shell (dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/arm64/aarch64/;s/powerpc$$/ppc/;s/hppa/parisc/;s/ppc64el/ppc64le/') -+- endif -+ archExpr = case "$(mach)" in \ -+ i[3-9]86) \ -+ echo i586 \ -+diff -Nur openjdk.orig/jdk/make/common/shared/Sanity.gmk openjdk/jdk/make/common/shared/Sanity.gmk -+--- openjdk.orig/jdk/make/common/shared/Sanity.gmk 2017-02-13 04:45:45.000000000 +0100 -++++ openjdk/jdk/make/common/shared/Sanity.gmk 2017-04-01 21:43:13.132492910 +0200 -+@@ -114,11 +114,6 @@ -+ elif [ -f /etc/lsb-release ] ; then \ -+ $(EGREP) DISTRIB_RELEASE /etc/lsb-release | $(SED) -e 's@.*DISTRIB_RELEASE=\(.*\)@\1@'; \ -+ fi) -+- ALSA_INCLUDE=/usr/include/alsa/version.h -+- ALSA_LIBRARY=/usr/lib/libasound.so -+- _ALSA_VERSION := $(shell $(EGREP) SND_LIB_VERSION_STR $(ALSA_INCLUDE) | \ -+- $(SED) -e 's@.*"\(.*\)".*@\1@' ) -+- ALSA_VERSION := $(call GetVersion,$(_ALSA_VERSION)) -+ endif -+ -+ ifeq ($(PLATFORM), macosx) -+@@ -225,7 +220,6 @@ -+ sane-compiler \ -+ sane-link \ -+ sane-cacerts \ -+- sane-alsa-headers \ -+ sane-ant_v |