diff options
author | fhajny <fhajny@pkgsrc.org> | 2018-02-23 14:43:49 +0000 |
---|---|---|
committer | fhajny <fhajny@pkgsrc.org> | 2018-02-23 14:43:49 +0000 |
commit | d3394c7212cc7638582235d5f520bd7060e282fc (patch) | |
tree | baad1ec4732c7d82cc143d999797fc4ed393a0fe /lang | |
parent | e9ce520a060f5167e346bcc898bfb8f8278487e1 (diff) | |
download | pkgsrc-d3394c7212cc7638582235d5f520bd7060e282fc.tar.gz |
lang/openjdk8: The libinstrument, libnpt and libsplashscreen libs
require to be linked against libiconv on SunOS too. Fixes problems
with e.g. the JPDA debugger. Bump PKGREVISION.
Diffstat (limited to 'lang')
-rw-r--r-- | lang/openjdk8/Makefile | 3 | ||||
-rw-r--r-- | lang/openjdk8/distinfo | 8 | ||||
-rw-r--r-- | lang/openjdk8/patches/patch-jdk_make_lib_Awt2dLibraries.gmk | 15 | ||||
-rw-r--r-- | lang/openjdk8/patches/patch-jdk_make_lib_CoreLibraries.gmk | 6 | ||||
-rw-r--r-- | lang/openjdk8/patches/patch-jdk_make_lib_ServiceabilityLibraries.gmk | 14 |
5 files changed, 30 insertions, 16 deletions
diff --git a/lang/openjdk8/Makefile b/lang/openjdk8/Makefile index 3b4f49e14bc..8eb55d0e33e 100644 --- a/lang/openjdk8/Makefile +++ b/lang/openjdk8/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.60 2018/02/16 22:31:01 wiz Exp $ +# $NetBSD: Makefile,v 1.61 2018/02/23 14:43:49 fhajny Exp $ DISTNAME= openjdk-1.8.162-20180212 PKGNAME= openjdk8-1.8.162 +PKGREVISION= 1 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/} EXTRACT_SUFX= .tar.xz diff --git a/lang/openjdk8/distinfo b/lang/openjdk8/distinfo index 33221437495..12801630d77 100644 --- a/lang/openjdk8/distinfo +++ b/lang/openjdk8/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.53 2018/02/13 12:57:44 ryoon Exp $ +$NetBSD: distinfo,v 1.54 2018/02/23 14:43:49 fhajny Exp $ SHA1 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 7408f52d3bbe35c2b14bbd3215cbf60f1335d334 RMD160 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 24f1577b5fc86d137f070aedb4610c8c89e45815 @@ -110,10 +110,10 @@ SHA1 (patch-jdk_make_CompileLaunchers.gmk) = 1a8807595c5774fc6ecfc7caa3b53b806cc SHA1 (patch-jdk_make_CreateJars.gmk) = 0f49c8ec33121d7878ea4b6bd06d2e4e4af9a1d5 SHA1 (patch-jdk_make_GenerateSources.gmk) = ec1b64805afb6edca637d87529b1d3fa59d20828 SHA1 (patch-jdk_make_Images.gmk) = e6643dcb25ad5457efe610f6ab7fd0ccc9b5ed41 -SHA1 (patch-jdk_make_lib_Awt2dLibraries.gmk) = 519960ee33b748b5d91b101c2d644117a6b18e12 -SHA1 (patch-jdk_make_lib_CoreLibraries.gmk) = 60392b9e8f4c823cffb120b9d7418bf8cb31e776 +SHA1 (patch-jdk_make_lib_Awt2dLibraries.gmk) = 46afef0bd826145c3d6277c7b73c98e595e80092 +SHA1 (patch-jdk_make_lib_CoreLibraries.gmk) = 21a46be1c8247d528a2e0666ca9a40520327771a SHA1 (patch-jdk_make_lib_NioLibraries.gmk) = 5a1044c444e534d627b46d820d27bb545e65959d -SHA1 (patch-jdk_make_lib_ServiceabilityLibraries.gmk) = 76eb64f3602f67ccb346df7a0acedf097869ba76 +SHA1 (patch-jdk_make_lib_ServiceabilityLibraries.gmk) = dc79dbffca38953fcded8fd0a5ad58b2d0409e0d SHA1 (patch-jdk_make_lib_SoundLibraries.gmk) = b63cf0ebe204acf7264704916df875a31de84393 SHA1 (patch-jdk_src_share_classes_sun_security_jca_ProviderConfig.java) = b7d53d0c3554eebde8f7180e75259eb25123ce8b SHA1 (patch-jdk_src_share_lib_security_java.security-bsd) = 5a64fc1205a5bd2f6586ad65ca21f93dfffb1606 diff --git a/lang/openjdk8/patches/patch-jdk_make_lib_Awt2dLibraries.gmk b/lang/openjdk8/patches/patch-jdk_make_lib_Awt2dLibraries.gmk index 5737312b5b7..629070068c3 100644 --- a/lang/openjdk8/patches/patch-jdk_make_lib_Awt2dLibraries.gmk +++ b/lang/openjdk8/patches/patch-jdk_make_lib_Awt2dLibraries.gmk @@ -1,8 +1,9 @@ -$NetBSD: patch-jdk_make_lib_Awt2dLibraries.gmk,v 1.3 2017/05/10 14:01:58 ryoon Exp $ +$NetBSD: patch-jdk_make_lib_Awt2dLibraries.gmk,v 1.4 2018/02/23 14:43:49 fhajny Exp $ GCC support. +Proper libiconv link (and SunOS needs it too). ---- jdk/make/lib/Awt2dLibraries.gmk.orig 2017-04-27 09:44:53.000000000 +0000 +--- jdk/make/lib/Awt2dLibraries.gmk.orig 2017-11-28 00:13:34.000000000 +0000 +++ jdk/make/lib/Awt2dLibraries.gmk @@ -48,6 +48,8 @@ ifneq ($(OPENJDK_TARGET_OS), windows) BUILD_LIBMLIB_LDLIBS += $(LIBM) $(LIBDL) @@ -30,9 +31,13 @@ GCC support. else JAWT_LIBS += -lawt_headless HEADLESS_CFLAG += -DHEADLESS -@@ -1276,7 +1277,7 @@ ifndef BUILD_HEADLESS_ONLY - # Solaris still uses OPENWIN_LIB .. - LIBSPLASHSCREEN_LDFLAGS_SUFFIX += -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -lX11 -lXext $(LIBM) -lpthread +@@ -1273,10 +1274,9 @@ ifndef BUILD_HEADLESS_ONLY + else ifeq ($(OPENJDK_TARGET_OS), windows) + LIBSPLASHSCREEN_LDFLAGS_SUFFIX += kernel32.lib user32.lib gdi32.lib delayimp.lib -DELAYLOAD:user32.dll + else ifeq ($(OPENJDK_TARGET_OS), solaris) +- # Solaris still uses OPENWIN_LIB .. +- LIBSPLASHSCREEN_LDFLAGS_SUFFIX += -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -lX11 -lXext $(LIBM) -lpthread ++ LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -L$(PACKAGE_PATH)/lib $(LIBICONV) -pthread else ifeq ($(OPENJDK_TARGET_OS), bsd) - LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -L$(PACKAGE_PATH)/lib -liconv -pthread + LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -L$(PACKAGE_PATH)/lib $(LIBICONV) -pthread diff --git a/lang/openjdk8/patches/patch-jdk_make_lib_CoreLibraries.gmk b/lang/openjdk8/patches/patch-jdk_make_lib_CoreLibraries.gmk index 7653918a01a..b0b1a16bfa2 100644 --- a/lang/openjdk8/patches/patch-jdk_make_lib_CoreLibraries.gmk +++ b/lang/openjdk8/patches/patch-jdk_make_lib_CoreLibraries.gmk @@ -1,6 +1,7 @@ -$NetBSD: patch-jdk_make_lib_CoreLibraries.gmk,v 1.4 2017/11/28 05:07:25 ryoon Exp $ +$NetBSD: patch-jdk_make_lib_CoreLibraries.gmk,v 1.5 2018/02/23 14:43:49 fhajny Exp $ Ensure we can find zlib. +Proper libiconv link (and SunOS needs it too). --- jdk/make/lib/CoreLibraries.gmk.orig 2017-11-28 00:13:34.000000000 +0000 +++ jdk/make/lib/CoreLibraries.gmk @@ -20,12 +21,13 @@ Ensure we can find zlib. BUILD_LIBZIP_REORDER := ifeq ($(OPENJDK_TARGET_OS), solaris) ifneq ($(OPENJDK_TARGET_CPU), x86_64) -@@ -550,7 +552,7 @@ $(eval $(call SetupNativeCompilation,BUI +@@ -550,7 +552,8 @@ $(eval $(call SetupNativeCompilation,BUI MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libnpt/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_bsd := -L$(PACKAGE_PATH)/lib -liconv, \ + LDFLAGS_bsd := $(LIBICONV), \ ++ LDFLAGS_solaris := $(LIBICONV), \ LDFLAGS_macosx := -liconv, \ LDFLAGS_SUFFIX_windows := -export:nptInitialize -export:nptTerminate, \ LDFLAGS_SUFFIX_solaris := -lc, \ diff --git a/lang/openjdk8/patches/patch-jdk_make_lib_ServiceabilityLibraries.gmk b/lang/openjdk8/patches/patch-jdk_make_lib_ServiceabilityLibraries.gmk index 6af1901c104..27f735ceece 100644 --- a/lang/openjdk8/patches/patch-jdk_make_lib_ServiceabilityLibraries.gmk +++ b/lang/openjdk8/patches/patch-jdk_make_lib_ServiceabilityLibraries.gmk @@ -1,9 +1,15 @@ -$NetBSD: patch-jdk_make_lib_ServiceabilityLibraries.gmk,v 1.1 2017/05/10 14:01:58 ryoon Exp $ +$NetBSD: patch-jdk_make_lib_ServiceabilityLibraries.gmk,v 1.2 2018/02/23 14:43:49 fhajny Exp $ ---- jdk/make/lib/ServiceabilityLibraries.gmk.orig 2017-04-27 09:44:53.000000000 +0000 +Proper libiconv link (and SunOS needs it too). + +--- jdk/make/lib/ServiceabilityLibraries.gmk.orig 2017-11-28 00:13:34.000000000 +0000 +++ jdk/make/lib/ServiceabilityLibraries.gmk -@@ -283,7 +283,7 @@ $(eval $(call SetupNativeCompilation,BUI - LDFLAGS_SUFFIX_solaris := $(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL) -lc, \ +@@ -280,10 +280,10 @@ $(eval $(call SetupNativeCompilation,BUI + -framework Cocoa -framework Security -framework ApplicationServices, \ + LDFLAGS_SUFFIX := $(LIBINSTRUMENT_LDFLAGS_SUFFIX), \ + LDFLAGS_SUFFIX_macosx := -liconv $(LIBZ), \ +- LDFLAGS_SUFFIX_solaris := $(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL) -lc, \ ++ LDFLAGS_SUFFIX_solaris := $(LIBICONV) $(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL) -lc, \ LDFLAGS_SUFFIX_linux := $(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL), \ LDFLAGS_SUFFIX_aix := $(LIBZ) -L$(JDK_OUTPUTDIR)/objs -ljli_static $(LIBDL),\ - LDFLAGS_SUFFIX_bsd := -L$(PACKAGE_PATH)/lib -liconv $(LIBZ), \ |