summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-core/openjdk/openjdk-7_91b01-2.6.2.bb2
-rw-r--r--recipes-core/openjdk/patches-openjdk-7/icedtea-jdk-build-nio-gensor-genuc-gensc-static.patch29
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 = "\
52ICEDTEAPATCHES = "\ 52ICEDTEAPATCHES = "\
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 = "\
61DISTRIBUTION_PATCHES = "\ 60DISTRIBUTION_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