From d4fbf276edcc2dbf7531ac0daa2bb169c3d5adee Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Tue, 15 Dec 2015 14:46:45 +0800 Subject: openjdk-7: drop an inappropriate patch The patch icedtea-jdk-build-nio-gensor-genuc-gensc-static.patch is to add static option to build nio gensor/genuc/gensc, and was added when upgrading to IcedTea 2.6.1 OpenJDK 7u85b01. Another patch icedtea-jdk-nio-use-host-cc.patch uses host cc for nio build so it fails on host that lack of static libraries: | /usr/bin/ld: cannot find -lpthread And there is no comments explaining why it needs static linking, so drop the patch for now unless we have better understanding and make a more proper patch. Signed-off-by: Jackie Huang Signed-off-by: Otavio Salvador --- recipes-core/openjdk/openjdk-7_91b01-2.6.2.bb | 2 -- ...a-jdk-build-nio-gensor-genuc-gensc-static.patch | 29 ---------------------- 2 files changed, 31 deletions(-) delete mode 100644 recipes-core/openjdk/patches-openjdk-7/icedtea-jdk-build-nio-gensor-genuc-gensc-static.patch diff --git a/recipes-core/openjdk/openjdk-7_91b01-2.6.2.bb b/recipes-core/openjdk/openjdk-7_91b01-2.6.2.bb index 4bff40a..854d179 100644 --- a/recipes-core/openjdk/openjdk-7_91b01-2.6.2.bb +++ b/recipes-core/openjdk/openjdk-7_91b01-2.6.2.bb @@ -52,7 +52,6 @@ OEPATCHES = "\ ICEDTEAPATCHES = "\ file://icedtea-zero-hotspotfix.patch;apply=no \ file://icedtea-jdk-nio-use-host-cc.patch;apply=no \ - file://icedtea-jdk-build-nio-gensor-genuc-gensc-static.patch;apply=no \ file://icedtea-jdk-rmi-crosscompile.patch;apply=no \ file://icedtea-crosscompile-fix.patch;apply=no \ file://icedtea-xawt-crosscompile-fix.patch;apply=no \ @@ -61,7 +60,6 @@ ICEDTEAPATCHES = "\ DISTRIBUTION_PATCHES = "\ patches/icedtea-zero-hotspotfix.patch \ patches/icedtea-jdk-nio-use-host-cc.patch \ - patches/icedtea-jdk-build-nio-gensor-genuc-gensc-static.patch \ patches/icedtea-jdk-rmi-crosscompile.patch \ patches/icedtea-crosscompile-fix.patch \ patches/icedtea-xawt-crosscompile-fix.patch \ diff --git a/recipes-core/openjdk/patches-openjdk-7/icedtea-jdk-build-nio-gensor-genuc-gensc-static.patch b/recipes-core/openjdk/patches-openjdk-7/icedtea-jdk-build-nio-gensor-genuc-gensc-static.patch deleted file mode 100644 index 3152b38..0000000 --- a/recipes-core/openjdk/patches-openjdk-7/icedtea-jdk-build-nio-gensor-genuc-gensc-static.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- openjdk/jdk/make/java/nio/Makefile -+++ openjdk/jdk/make/java/nio/Makefile -@@ -966,7 +966,7 @@ - - $(GENSOR_EXE) : $(TEMPDIR)/$(GENSOR_SRC) - $(prep-target) -- ($(CD) $(TEMPDIR); $(NIO_CC) $(CPPFLAGS) $(LDDFLAGS) \ -+ ($(CD) $(TEMPDIR); $(NIO_CC) $(CPPFLAGS) -static $(LDDFLAGS) \ - -o genSocketOptionRegistry$(EXE_SUFFIX) $(GENSOR_SRC)) - - ifdef NIO_PLATFORM_CLASSES_ROOT_DIR -@@ -1006,7 +1006,7 @@ - - $(GENUC_EXE) : $(GENUC_SRC) - $(prep-target) -- $(NIO_CC) $(CPPFLAGS) -o $@ $(GENUC_SRC) -+ $(NIO_CC) $(CPPFLAGS) -static -o $@ $(GENUC_SRC) - - ifdef NIO_PLATFORM_CLASSES_ROOT_DIR - $(SFS_GEN)/UnixConstants.java: $(NIO_PLATFORM_CLASSES_ROOT_DIR)/sun/nio/fs/UnixConstants-$(PLATFORM)-$(ARCH).java -@@ -1032,7 +1032,7 @@ - - $(GENSC_EXE) : $(GENSC_SRC) - $(prep-target) -- $(NIO_CC) $(CPPFLAGS) -o $@ $(GENSC_SRC) -+ $(NIO_CC) $(CPPFLAGS) -static -o $@ $(GENSC_SRC) - - ifdef NIO_PLATFORM_CLASSES_ROOT_DIR - $(SFS_GEN)/SolarisConstants.java: $(NIO_PLATFORM_CLASSES_ROOT_DIR)/sun/nio/fs/SolarisConstants-$(PLATFORM)-$(ARCH).java -- cgit v1.2.3-54-g00ecf