diff options
author | Jackie Huang <jackie.huang@windriver.com> | 2015-12-15 14:46:45 +0800 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2015-12-17 10:39:21 -0200 |
commit | d4fbf276edcc2dbf7531ac0daa2bb169c3d5adee (patch) | |
tree | a8808adf3748af016b04c8ac6025ccae6b23dc47 | |
parent | a16545d6c8ecb1eda359d86ad5613f1d9d7b9f48 (diff) | |
download | meta-java-d4fbf276edcc2dbf7531ac0daa2bb169c3d5adee.tar.gz |
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 <jackie.huang@windriver.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r-- | recipes-core/openjdk/openjdk-7_91b01-2.6.2.bb | 2 | ||||
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-7/icedtea-jdk-build-nio-gensor-genuc-gensc-static.patch | 29 |
2 files changed, 0 insertions, 31 deletions
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 = "\ | |||
52 | ICEDTEAPATCHES = "\ | 52 | ICEDTEAPATCHES = "\ |
53 | file://icedtea-zero-hotspotfix.patch;apply=no \ | 53 | file://icedtea-zero-hotspotfix.patch;apply=no \ |
54 | file://icedtea-jdk-nio-use-host-cc.patch;apply=no \ | 54 | file://icedtea-jdk-nio-use-host-cc.patch;apply=no \ |
55 | file://icedtea-jdk-build-nio-gensor-genuc-gensc-static.patch;apply=no \ | ||
56 | file://icedtea-jdk-rmi-crosscompile.patch;apply=no \ | 55 | file://icedtea-jdk-rmi-crosscompile.patch;apply=no \ |
57 | file://icedtea-crosscompile-fix.patch;apply=no \ | 56 | file://icedtea-crosscompile-fix.patch;apply=no \ |
58 | file://icedtea-xawt-crosscompile-fix.patch;apply=no \ | 57 | file://icedtea-xawt-crosscompile-fix.patch;apply=no \ |
@@ -61,7 +60,6 @@ ICEDTEAPATCHES = "\ | |||
61 | DISTRIBUTION_PATCHES = "\ | 60 | DISTRIBUTION_PATCHES = "\ |
62 | patches/icedtea-zero-hotspotfix.patch \ | 61 | patches/icedtea-zero-hotspotfix.patch \ |
63 | patches/icedtea-jdk-nio-use-host-cc.patch \ | 62 | patches/icedtea-jdk-nio-use-host-cc.patch \ |
64 | patches/icedtea-jdk-build-nio-gensor-genuc-gensc-static.patch \ | ||
65 | patches/icedtea-jdk-rmi-crosscompile.patch \ | 63 | patches/icedtea-jdk-rmi-crosscompile.patch \ |
66 | patches/icedtea-crosscompile-fix.patch \ | 64 | patches/icedtea-crosscompile-fix.patch \ |
67 | patches/icedtea-xawt-crosscompile-fix.patch \ | 65 | 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 @@ | |||
1 | --- openjdk/jdk/make/java/nio/Makefile | ||
2 | +++ openjdk/jdk/make/java/nio/Makefile | ||
3 | @@ -966,7 +966,7 @@ | ||
4 | |||
5 | $(GENSOR_EXE) : $(TEMPDIR)/$(GENSOR_SRC) | ||
6 | $(prep-target) | ||
7 | - ($(CD) $(TEMPDIR); $(NIO_CC) $(CPPFLAGS) $(LDDFLAGS) \ | ||
8 | + ($(CD) $(TEMPDIR); $(NIO_CC) $(CPPFLAGS) -static $(LDDFLAGS) \ | ||
9 | -o genSocketOptionRegistry$(EXE_SUFFIX) $(GENSOR_SRC)) | ||
10 | |||
11 | ifdef NIO_PLATFORM_CLASSES_ROOT_DIR | ||
12 | @@ -1006,7 +1006,7 @@ | ||
13 | |||
14 | $(GENUC_EXE) : $(GENUC_SRC) | ||
15 | $(prep-target) | ||
16 | - $(NIO_CC) $(CPPFLAGS) -o $@ $(GENUC_SRC) | ||
17 | + $(NIO_CC) $(CPPFLAGS) -static -o $@ $(GENUC_SRC) | ||
18 | |||
19 | ifdef NIO_PLATFORM_CLASSES_ROOT_DIR | ||
20 | $(SFS_GEN)/UnixConstants.java: $(NIO_PLATFORM_CLASSES_ROOT_DIR)/sun/nio/fs/UnixConstants-$(PLATFORM)-$(ARCH).java | ||
21 | @@ -1032,7 +1032,7 @@ | ||
22 | |||
23 | $(GENSC_EXE) : $(GENSC_SRC) | ||
24 | $(prep-target) | ||
25 | - $(NIO_CC) $(CPPFLAGS) -o $@ $(GENSC_SRC) | ||
26 | + $(NIO_CC) $(CPPFLAGS) -static -o $@ $(GENSC_SRC) | ||
27 | |||
28 | ifdef NIO_PLATFORM_CLASSES_ROOT_DIR | ||
29 | $(SFS_GEN)/SolarisConstants.java: $(NIO_PLATFORM_CLASSES_ROOT_DIR)/sun/nio/fs/SolarisConstants-$(PLATFORM)-$(ARCH).java | ||