Fix build with converters/libiconv and update distinfo for previous

5 files changed, 62 insertions, 12 deletions

diff --git a/lang/openjdk8/Makefile b/lang/openjdk8/Makefile
index c76314ce624..969df2b34a3 100644
--- a/lang/openjdk8/Makefile
+++ b/lang/openjdk8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2017/04/27 14:44:05 ryoon Exp $
+# $NetBSD: Makefile,v 1.49 2017/05/10 14:01:58 ryoon Exp $
 
 DISTNAME=	openjdk-1.8.131-20170427
 PKGNAME=	openjdk8-1.8.131
@@ -145,7 +145,9 @@ SUBST_SED.fontpaths+=		-e 's|@BUILDLINK_PREFIX.fontconfig@|${BUILDLINK_PREFIX.fo
 SUBST_CLASSES+=			zlibpath
 SUBST_STAGE.zlibpath=		pre-build
 SUBST_FILES.zlibpath=		jdk/make/CompileLaunchers.gmk jdk/make/lib/CoreLibraries.gmk
+SUBST_FILES.zlibpath+=		jdk/make/lib/Awt2dLibraries.gmk jdk/make/lib/ServiceabilityLibraries.gmk
 SUBST_VARS.zlibpath=		COMPILER_RPATH_FLAG BUILDLINK_PREFIX.zlib
+SUBST_VARS.zlibpath+=		BUILDLINK_PREFIX.iconv
 
 PLIST_VARS+=	i386
 .if ${MACHINE_ARCH} == "i386"
diff --git a/lang/openjdk8/distinfo b/lang/openjdk8/distinfo
index f5eed2bae53..2f88718094a 100644
--- a/lang/openjdk8/distinfo
+++ b/lang/openjdk8/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.46 2017/04/27 14:44:05 ryoon Exp $
+$NetBSD: distinfo,v 1.47 2017/05/10 14:01:58 ryoon 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
@@ -59,7 +59,7 @@ SHA1 (patch-bh) = 6194a7c319a496f8ff7df173912cf87118f26a63
 SHA1 (patch-bi) = 190056b3d4c42986ae0a600668b02711598361b8
 SHA1 (patch-bn) = a50dbe17236a90d60d4bbb852ae447e51a279892
 SHA1 (patch-common_autoconf_boot-jdk.m4) = 530da90ea4062f9d8c208557ff634579b0b19f55
-SHA1 (patch-common_autoconf_generated-configure.sh) = 065821e257ec2a371cb7f377a42f1fdbd2496524
+SHA1 (patch-common_autoconf_generated-configure.sh) = 116f1b37fc737ca30998a28b40ef00f7be95a744
 SHA1 (patch-common_autoconf_spec.gmk.in) = e98bc4c8a09f49c6a26447e6f78abf4709ee694b
 SHA1 (patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java) = 893f3b7ad0839a75be49ddd0f5eefcff2dbd2928
 SHA1 (patch-hotspot_make_bsd_makefiles_defs.make) = 2d350a9b47883b3101e97cafa987104e2c4c54c4
@@ -109,9 +109,10 @@ SHA1 (patch-jdk_make_CompileLaunchers.gmk) = fc386f8992db579483ad779f1aecfca762a
 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) = ea107ae5e396263489cac9b058bcdd92891baeac
-SHA1 (patch-jdk_make_lib_CoreLibraries.gmk) = 15ed4c5d01b50ab63447a19883925ac975d8390f
+SHA1 (patch-jdk_make_lib_Awt2dLibraries.gmk) = 519960ee33b748b5d91b101c2d644117a6b18e12
+SHA1 (patch-jdk_make_lib_CoreLibraries.gmk) = 0afdb43822b01b244d56446ae11d15629eeec285
 SHA1 (patch-jdk_make_lib_NioLibraries.gmk) = 5a1044c444e534d627b46d820d27bb545e65959d
+SHA1 (patch-jdk_make_lib_ServiceabilityLibraries.gmk) = 76eb64f3602f67ccb346df7a0acedf097869ba76
 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 1c7408b4332..5737312b5b7 100644
--- a/lang/openjdk8/patches/patch-jdk_make_lib_Awt2dLibraries.gmk
+++ b/lang/openjdk8/patches/patch-jdk_make_lib_Awt2dLibraries.gmk
@@ -1,10 +1,19 @@
-$NetBSD: patch-jdk_make_lib_Awt2dLibraries.gmk,v 1.2 2016/03/12 07:31:02 tnn Exp $
+$NetBSD: patch-jdk_make_lib_Awt2dLibraries.gmk,v 1.3 2017/05/10 14:01:58 ryoon Exp $
 
 GCC support.
 
---- jdk/make/lib/Awt2dLibraries.gmk.orig	2016-02-19 14:48:27.000000000 +0000
+--- jdk/make/lib/Awt2dLibraries.gmk.orig	2017-04-27 09:44:53.000000000 +0000
 +++ jdk/make/lib/Awt2dLibraries.gmk
-@@ -695,7 +695,6 @@ $(eval $(call SetupNativeCompilation,BUI
+@@ -48,6 +48,8 @@ ifneq ($(OPENJDK_TARGET_OS), windows)
+   BUILD_LIBMLIB_LDLIBS += $(LIBM) $(LIBDL)
+ endif
+ 
++LIBICONV := @COMPILER_RPATH_FLAG@@BUILDLINK_PREFIX.iconv@/lib -L@BUILDLINK_PREFIX.iconv@/lib -liconv
++
+ $(eval $(call SetupNativeCompilation,BUILD_LIBMLIB_IMAGE, \
+     LIBRARY := mlib_image, \
+     OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+@@ -695,7 +697,6 @@ $(eval $(call SetupNativeCompilation,BUI
          $(SHARED_LIBRARY_FLAGS) \
          -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
          -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug, \
@@ -12,7 +21,7 @@ GCC support.
      CFLAGS_windows := -DCMS_IS_WINDOWS_, \
      MAPFILE := $(JDK_TOPDIR)/make/mapfiles/liblcms/mapfile-vers, \
      LDFLAGS := $(LDFLAGS_JDKLIB) \
-@@ -1070,7 +1069,7 @@ else # OPENJDK_TARGET_OS not windows
+@@ -1070,7 +1071,7 @@ else # OPENJDK_TARGET_OS not windows
        JAWT_LIBS += -lawt
      endif
      ifndef BUILD_HEADLESS_ONLY
@@ -21,3 +30,12 @@ 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
+   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
+   else	# .. all other Unixes can use X_LIBS
+     LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread
+   endif
diff --git a/lang/openjdk8/patches/patch-jdk_make_lib_CoreLibraries.gmk b/lang/openjdk8/patches/patch-jdk_make_lib_CoreLibraries.gmk
index 33cb8a679b1..dea035130e1 100644
--- a/lang/openjdk8/patches/patch-jdk_make_lib_CoreLibraries.gmk
+++ b/lang/openjdk8/patches/patch-jdk_make_lib_CoreLibraries.gmk
@@ -1,10 +1,10 @@
-$NetBSD: patch-jdk_make_lib_CoreLibraries.gmk,v 1.2 2016/07/19 12:32:15 jperkin Exp $
+$NetBSD: patch-jdk_make_lib_CoreLibraries.gmk,v 1.3 2017/05/10 14:01:58 ryoon Exp $
 
 Ensure we can find zlib.
 
---- jdk/make/lib/CoreLibraries.gmk.orig	2016-05-06 12:11:21.000000000 +0000
+--- jdk/make/lib/CoreLibraries.gmk.orig	2017-04-27 09:44:53.000000000 +0000
 +++ jdk/make/lib/CoreLibraries.gmk
-@@ -231,7 +231,7 @@ $(BUILD_LIBJAVA): $(BUILD_LIBFDLIBM)
+@@ -231,12 +231,14 @@ $(BUILD_LIBJAVA): $(BUILD_LIBFDLIBM)
  
  BUILD_LIBZIP_EXCLUDES :=
  ifeq ($(USE_EXTERNAL_LIBZ), true)
@@ -13,3 +13,19 @@ Ensure we can find zlib.
    LIBZIP_EXCLUDES += zlib-1.2.8
  else
    ZLIB_CPPFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.8
+ endif
+ 
++LIBICONV := @COMPILER_RPATH_FLAG@@BUILDLINK_PREFIX.iconv@/lib -L@BUILDLINK_PREFIX.iconv@/lib -liconv
++
+ BUILD_LIBZIP_REORDER :=
+ ifeq ($(OPENJDK_TARGET_OS), solaris)
+   ifneq ($(OPENJDK_TARGET_CPU), x86_64)
+@@ -528,7 +530,7 @@ $(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_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
new file mode 100644
index 00000000000..6af1901c104
--- /dev/null
+++ b/lang/openjdk8/patches/patch-jdk_make_lib_ServiceabilityLibraries.gmk
@@ -0,0 +1,13 @@
+$NetBSD: patch-jdk_make_lib_ServiceabilityLibraries.gmk,v 1.1 2017/05/10 14:01:58 ryoon Exp $
+
+--- jdk/make/lib/ServiceabilityLibraries.gmk.orig	2017-04-27 09:44:53.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, \
+     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), \
++    LDFLAGS_SUFFIX_bsd := $(LIBICONV) $(LIBZ), \
+     VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+     RC_FLAGS := $(RC_FLAGS) \
+         -D "JDK_FNAME=instrument.dll" \