this now builds

[Christos Zoulas <christos%zoulas.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Christos Zoulas <christos%zoulas.com@localhost>
Pushed By:	christos
Date:		Thu Nov 4 14:55:20 2021 -0400
Changeset:	3740280d818c2484b2f6c6d05bf580b844645f10

Modified Files:
	openjdk16/Makefile
	openjdk16/distinfo
Removed Files:
	openjdk16/patches/patch-make_autoconf_lib-bundled.m4

Log Message:
this now builds

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3740280d818c2484b2f6c6d05bf580b844645f10

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 openjdk16/Makefile                                   |  8 ++++----
 openjdk16/distinfo                                   |  1 -
 openjdk16/patches/patch-make_autoconf_lib-bundled.m4 | 16 ----------------
 3 files changed, 4 insertions(+), 21 deletions(-)

diffs:
diff --git a/openjdk16/Makefile b/openjdk16/Makefile
index 7044d5ab51..9073a0699b 100644
--- a/openjdk16/Makefile
+++ b/openjdk16/Makefile
@@ -109,11 +109,11 @@ CONFIGURE_ARGS+=	--with-toolchain-type=gcc
 .include "bootstrap.mk"
 .include "options.mk"
 
-#SUBST_CLASSES+=		libpath
-#SUBST_STAGE.libpath=	pre-configure
-#SUBST_FILES.libpath+=	src/hotspot/os/bsd/os_bsd.cpp
+SUBST_CLASSES+=		libpath
+SUBST_STAGE.libpath=	pre-configure
+SUBST_FILES.libpath+=	src/hotspot/os/bsd/os_bsd.cpp
 #SUBST_FILES.libpath+=	make/autoconf/flags-cflags.m4
-SUBST_FILES.libpath+=	make/autoconf/lib-bundled.m4
+#SUBST_FILES.libpath+=	make/autoconf/lib-bundled.m4
 SUBST_FILES.libpath+=	make/autoconf/lib-freetype.m4
 SUBST_FILES.libpath+=	make/autoconf/lib-x11.m4
 SUBST_VARS.libpath=	PREFIX COMPILER_RPATH_FLAG JAVA_NAME BUILDLINK_PREFIX.zlib X11BASE
diff --git a/openjdk16/distinfo b/openjdk16/distinfo
index 4b03e2de78..2c31d555d7 100644
--- a/openjdk16/distinfo
+++ b/openjdk16/distinfo
@@ -7,7 +7,6 @@ RMD160 (jdk16u-jdk-16.0.1-9-1.tar.gz) = 8c1f71379730fdd8dbac1c122066658fd99a6ef6
 SHA512 (jdk16u-jdk-16.0.1-9-1.tar.gz) = 45ae7a7d14d26b85e917d9002fe525a9a3472c8ef2a8ad13d3a78fe0f85c2ebda53fd26a6d395aaed1a1bbff99287db69037410bd15bed61b3484df5a7428f7d
 Size (jdk16u-jdk-16.0.1-9-1.tar.gz) = 104513577 bytes
 SHA1 (patch-make_autoconf_flags-cflags.m4) = e09a84bcdeccb8a55b2de5003e839b7b311c3115
-SHA1 (patch-make_autoconf_lib-bundled.m4) = 93c1a39e50555c7ac1c9a426400640d28c33bb92
 SHA1 (patch-make_autoconf_lib-freetype.m4) = ede1fcaa4551c66c5173be809f8c2eb3eabc140c
 SHA1 (patch-make_autoconf_lib-x11.m4) = fa1834edb7c053735f6e54469fd17cc38854ebf3
 SHA1 (patch-make_common_NativeCompilation.gmk) = 8ecb719835e7c9e058592326a7df499bd3079f8e
diff --git a/openjdk16/patches/patch-make_autoconf_lib-bundled.m4 b/openjdk16/patches/patch-make_autoconf_lib-bundled.m4
deleted file mode 100644
index aa0236f1ce..0000000000
--- a/openjdk16/patches/patch-make_autoconf_lib-bundled.m4
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-make_autoconf_lib-bundled.m4,v 1.1 2019/10/01 12:36:34 tnn Exp $
-
-Add rpath for zlib.
-
---- make/autoconf/lib-bundled.m4.orig	2021-04-23 22:52:34.000000000 -0400
-+++ make/autoconf/lib-bundled.m4	2021-06-10 07:19:56.667130306 -0400
-@@ -261,7 +261,8 @@
-   if test "x$USE_EXTERNAL_LIBZ" = "xfalse"; then
-     LIBZ_CFLAGS="$LIBZ_CFLAGS -I$TOPDIR/src/java.base/share/native/libzip/zlib"
-   else
--    LIBZ_LIBS="-lz"
-+    LIBZ_CFLAGS="-I@BUILDLINK_PREFIX.zlib@/include"
-+    LIBZ_LIBS="@COMPILER_RPATH_FLAG@@BUILDLINK_PREFIX.zlib@/lib -L@BUILDLINK_PREFIX.zlib@/lib -lz"
-   fi
- 
-   AC_SUBST(USE_EXTERNAL_LIBZ)