diff options
Diffstat (limited to 'jtools/openjdk')
| -rw-r--r-- | jtools/openjdk/Makefile | 4 | ||||
| -rw-r--r-- | jtools/openjdk/patches/iconv.patch | 36 | ||||
| -rw-r--r-- | jtools/openjdk/patches/remove-libnsl.patch | 72 |
3 files changed, 111 insertions, 1 deletions
diff --git a/jtools/openjdk/Makefile b/jtools/openjdk/Makefile index 12426a8d2..600db055b 100644 --- a/jtools/openjdk/Makefile +++ b/jtools/openjdk/Makefile @@ -59,7 +59,9 @@ $(WRKDIST)/.extract: $(WRKDIST)/.extract_done cd ${WRKDIST}; tar xzf ${TOPDIR}/dl/${XALAN_NAME}_${XALAN_VERSION}-bin.tar.gz mkdir -p ${WRKBUILD}/drops cd ${TOPDIR}/dl; cp jaxp144_01.zip jdk6-jaf-b20.zip jdk6-jaxws-b20.zip ${WRKBUILD}/drops - cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/*.patch + cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/openjdk.patch + cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/iconv.patch + cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/remove-libnsl.patch touch $@ $(WRKDIST)/.configured: ${WRKDIST}/.extract diff --git a/jtools/openjdk/patches/iconv.patch b/jtools/openjdk/patches/iconv.patch new file mode 100644 index 000000000..c607d2195 --- /dev/null +++ b/jtools/openjdk/patches/iconv.patch @@ -0,0 +1,36 @@ + + add required linker flags. + +--- openjdk-6.orig/jdk/make/java/instrument/Makefile 2011-02-28 17:06:10.000000000 +0100 ++++ openjdk-6/jdk/make/java/instrument/Makefile 2011-04-11 23:14:27.571411016 +0200 +@@ -123,6 +123,8 @@ + # We don't want to link against -ljava + JAVALIB= + ++LDLIBS += -liconv ++ + # + # Add to ambient vpath so we pick up the library files + # +--- openjdk-6.orig/jdk/make/java/npt/Makefile 2011-02-28 17:06:11.000000000 +0100 ++++ openjdk-6/jdk/make/java/npt/Makefile 2011-04-11 23:14:07.017670197 +0200 +@@ -65,6 +65,8 @@ + # We don't want to link against -ljava + JAVALIB= + ++LDLIBS += -liconv ++ + # Add -export options to explicitly spell exported symbols + ifeq ($(PLATFORM), windows) + OTHER_LCF += -export:nptInitialize -export:nptTerminate +--- openjdk-6.orig/jdk/make/sun/splashscreen/Makefile 2011-02-28 17:06:12.000000000 +0100 ++++ openjdk-6/jdk/make/sun/splashscreen/Makefile 2011-04-11 23:15:07.221411030 +0200 +@@ -55,6 +55,8 @@ + + JAVALIB= + ++LDLIBS += -liconv ++ + # + # C Flags + # diff --git a/jtools/openjdk/patches/remove-libnsl.patch b/jtools/openjdk/patches/remove-libnsl.patch new file mode 100644 index 000000000..d867d436b --- /dev/null +++ b/jtools/openjdk/patches/remove-libnsl.patch @@ -0,0 +1,72 @@ + + remove libnsl from linking. + +--- openjdk-6.orig/jdk/make/java/hpi/hpi_common.gmk 2011-02-28 17:06:10.000000000 +0100 ++++ openjdk-6/jdk/make/java/hpi/hpi_common.gmk 2011-04-10 20:05:01.417672476 +0200 +@@ -86,5 +86,5 @@ + # Things that must be linked in. + # + ifneq ($(PLATFORM), windows) +-OTHER_LDLIBS += $(LIBSOCKET) -lnsl $(LIBM) -ldl ++OTHER_LDLIBS += $(LIBSOCKET) $(LIBM) -ldl + endif +--- openjdk-6.orig/jdk/make/java/java/Makefile 2011-02-28 17:06:10.000000000 +0100 ++++ openjdk-6/jdk/make/java/java/Makefile 2011-04-10 20:05:20.637673621 +0200 +@@ -205,7 +205,7 @@ + OTHER_LDLIBS += $(JVMLIB) -libpath:$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) fdlibm.lib \ + -libpath:$(OBJDIR)/../../../verify/$(OBJDIRNAME) verify.lib + else +-OTHER_LDLIBS += $(JVMLIB) -lverify $(LIBSOCKET) -lnsl -ldl \ ++OTHER_LDLIBS += $(JVMLIB) -lverify $(LIBSOCKET) -ldl \ + -L$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) -lfdlibm.$(ARCH) + endif + +--- openjdk-6.orig/jdk/make/java/net/Makefile 2011-02-28 17:06:10.000000000 +0100 ++++ openjdk-6/jdk/make/java/net/Makefile 2011-04-10 20:05:39.537672169 +0200 +@@ -97,7 +97,7 @@ + # Will not compile at warning level 3 if warnings are fatal + COMPILER_WARNINGS_FATAL=false + else +- OTHER_LDLIBS = $(LIBSOCKET) -lnsl -ldl $(JVMLIB) ++ OTHER_LDLIBS = $(LIBSOCKET) -ldl $(JVMLIB) + endif + ifeq ($(PLATFORM), linux) + OTHER_LDLIBS += -lpthread +--- openjdk-6.orig/jdk/make/jpda/transport/socket/Makefile 2011-02-28 17:06:11.000000000 +0100 ++++ openjdk-6/jdk/make/jpda/transport/socket/Makefile 2011-04-10 20:06:06.037672449 +0200 +@@ -42,11 +42,11 @@ + endif + + ifeq ($(PLATFORM), linux) +- OTHER_LDLIBS += -lnsl $(LIBSOCKET) -lpthread ++ OTHER_LDLIBS += $(LIBSOCKET) -lpthread + endif + + ifeq ($(PLATFORM), solaris) +- OTHER_LDLIBS += -lnsl $(LIBSOCKET) ++ OTHER_LDLIBS += $(LIBSOCKET) + endif + + ifeq ($(PLATFORM), windows) +--- openjdk-6.orig/jdk/make/java/java_hprof_demo/Makefile 2011-02-28 17:06:10.000000000 +0100 ++++ openjdk-6/jdk/make/java/java_hprof_demo/Makefile 2011-04-10 20:28:43.287672398 +0200 +@@ -83,7 +83,7 @@ + ifeq ($(PLATFORM), windows) + OTHER_LDLIBS += wsock32.lib winmm.lib + else +- OTHER_LDLIBS += $(LIBSOCKET) -lnsl -ldl ++ OTHER_LDLIBS += $(LIBSOCKET) -ldl + endif + + # +--- openjdk-6.orig/jdk/make/mkdemo/jvmti/hprof/Makefile 2011-02-28 17:06:11.000000000 +0100 ++++ openjdk-6/jdk/make/mkdemo/jvmti/hprof/Makefile 2011-04-11 10:23:11.538911604 +0200 +@@ -42,7 +42,7 @@ + OTHER_LDLIBS += $(LIBSOCKET) -lnsl -ldl + endif + ifeq ($(PLATFORM), linux) +- OTHER_LDLIBS += $(LIBSOCKET) -lnsl -ldl -lpthread ++ OTHER_LDLIBS += $(LIBSOCKET) -ldl -lpthread + endif + + # |