diff options
| author | tnn <tnn> | 2015-10-22 23:01:52 +0000 |
|---|---|---|
| committer | tnn <tnn> | 2015-10-22 23:01:52 +0000 |
| commit | bfab357c84772ff2304a58457e03065c73c9b529 (patch) | |
| tree | e3074c2e9749f00b07f309b6be27dac32550bafa /lang/openjdk8/Makefile | |
| parent | cbb0d21786dc53590c6028fa03fbd06d9671ae6f (diff) | |
| download | pkgsrc-bfab357c84772ff2304a58457e03065c73c9b529.tar.gz | |
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.
Diffstat (limited to 'lang/openjdk8/Makefile')
| -rw-r--r-- | lang/openjdk8/Makefile | 6 |
1 files changed, 4 insertions, 2 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} |