Fix Makefile 1.18 Differently. We do need to use GNU_CONFIGURE=yes,

because this is a GNU configure script and without it we do not get
config.{sub,guess} overrides.

Instead, pass --disable-option-checking to the configure script so that
unrecognized options that appear when using pkgsrc iconv are discarded.

3 files changed, 5 insertions, 20 deletions

diff --git a/lang/openjdk8/Makefile b/lang/openjdk8/Makefile
index b65488ad511..dfa42e1f738 100644
--- a/lang/openjdk8/Makefile
+++ b/lang/openjdk8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2015/09/29 14:55:45 ryoon Exp $
+# $NetBSD: Makefile,v 1.22 2015/10/22 23:01:52 tnn Exp $
 
 DISTNAME=	openjdk-1.8.60-20150929
 PKGNAME=	openjdk8-1.8.60
@@ -24,11 +24,12 @@ JAVA_WRAPPERS=	jar java javac javadoc javah javap jps keytool orbd \
 
 BUILD_DEPENDS+=		mozilla-rootcerts>=1.0.20140820nb2:../../security/mozilla-rootcerts
 
-HAS_CONFIGURE=		yes
+GNU_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	common/autoconf/configure
 CONFIG_SHELL=		bash
 CONFIG_SUB_OVERRIDE+=	common/autoconf/build-aux/config.sub
 CONFIG_GUESS_OVERRIDE+=	common/autoconf/build-aux/config.guess
+CONFIG_SUB_OVERRIDE+=	common/autoconf/build-aux/autoconf-config.sub
 CONFIG_GUESS_OVERRIDE+=	common/autoconf/build-aux/autoconf-config.guess
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		bash gmake pax pkg-config unzip:run zip:run
@@ -39,6 +40,7 @@ PLIST_SRC+=		${PLIST_SRC_DFLT}
 BUILDLINK_PASSTHRU_DIRS+=	${ALT_BOOTDIR}
 PREPEND_PATH+=			${ALT_BOOTDIR}/bin
 
+CONFIGURE_ARGS+=	--disable-option-checking # for --with-libiconv-prefix
 CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
 CONFIGURE_ARGS+=	--build=${MACHINE_GNU_PLATFORM:Q}
 CONFIGURE_ARGS+=	--host=${MACHINE_GNU_PLATFORM:Q}
diff --git a/lang/openjdk8/distinfo b/lang/openjdk8/distinfo
index ecfee488d53..1b62f0eb4ec 100644
--- a/lang/openjdk8/distinfo
+++ b/lang/openjdk8/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2015/10/22 21:55:55 jmcneill Exp $
+$NetBSD: distinfo,v 1.30 2015/10/22 23:01:52 tnn 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
@@ -47,7 +47,6 @@ SHA1 (patch-bh) = 6194a7c319a496f8ff7df173912cf87118f26a63
 SHA1 (patch-bi) = 190056b3d4c42986ae0a600668b02711598361b8
 SHA1 (patch-bn) = a50dbe17236a90d60d4bbb852ae447e51a279892
 SHA1 (patch-common_autoconf_boot-jdk.m4) = b7f8722a25c1c7ab489a9fd65cf60fb4af9530eb
-SHA1 (patch-common_autoconf_build-aux_autoconf-config.sub) = 53ac6deffff0f22a0da458c36d37ddbb909e99a4
 SHA1 (patch-common_autoconf_generated-configure.sh) = cda7bc95247400a1702e9da937d485d1a2084f97
 SHA1 (patch-common_autoconf_spec.gmk.in) = e98bc4c8a09f49c6a26447e6f78abf4709ee694b
 SHA1 (patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java) = 893f3b7ad0839a75be49ddd0f5eefcff2dbd2928
diff --git a/lang/openjdk8/patches/patch-common_autoconf_build-aux_autoconf-config.sub b/lang/openjdk8/patches/patch-common_autoconf_build-aux_autoconf-config.sub
deleted file mode 100644
index a1d7249fc0f..00000000000
--- a/lang/openjdk8/patches/patch-common_autoconf_build-aux_autoconf-config.sub
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-common_autoconf_build-aux_autoconf-config.sub,v 1.1 2015/10/22 21:55:55 jmcneill Exp $
-
-Fix build on NetBSD/arm (complaints that armv7--netbsdelf-eabihf is an unknown
-machine name).
-
---- common/autoconf/build-aux/autoconf-config.sub.orig	2015-09-28 21:01:41.000000000 +0000
-+++ common/autoconf/build-aux/autoconf-config.sub
-@@ -147,7 +147,7 @@ esac
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
-   nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
--  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
-   storm-chaos* | os2-emx* | rtmk-nova*)
-     os=-$maybe_os
-     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`