diff options
| author | jperkin <jperkin@pkgsrc.org> | 2016-02-25 14:42:55 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2016-02-25 14:42:55 +0000 |
| commit | 39aae52e063ed023435320f21c58a1c16d866d1f (patch) | |
| tree | 0285cf003fd624dc16685552fba2f200571a98ff /lang/gcc48 | |
| parent | 113ff2274f575cf33db39900e0a169183f6f9c2d (diff) | |
| download | pkgsrc-39aae52e063ed023435320f21c58a1c16d866d1f.tar.gz | |
Use OPSYSVARS.
Diffstat (limited to 'lang/gcc48')
| -rw-r--r-- | lang/gcc48/Makefile | 17 | ||||
| -rw-r--r-- | lang/gcc48/options.mk | 22 |
2 files changed, 15 insertions, 24 deletions
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile index f2fc22356e9..c52780a92f1 100644 --- a/lang/gcc48/Makefile +++ b/lang/gcc48/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2015/11/03 13:59:10 jperkin Exp $ +# $NetBSD: Makefile,v 1.23 2016/02/25 14:42:56 jperkin Exp $ GCC_PKGNAME= gcc48 .include "version.mk" @@ -77,14 +77,13 @@ CONFIGURE_ARGS+= --with-local-prefix=${GCC_PREFIX:Q} CONFIGURE_ARGS+= --enable-libssp CONFIGURE_ARGS+= --enable-threads=posix CONFIGURE_ARGS+= --with-boot-ldflags=${BOOT_LDFLAGS:Q} -.if ${OPSYS} == "NetBSD" -CONFIGURE_ARGS+= --with-gnu-ld --with-ld=/usr/bin/ld -CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/bin/as -MAKE_ENV+= ac_cv_func_clock_gettime=yes -.endif -.if ${OPSYS} == "DragonFly" -CONFIGURE_ARGS+= --disable-bootstrap -.endif + +CONFIGURE_ARGS.NetBSD+= --with-gnu-ld --with-ld=/usr/bin/ld +CONFIGURE_ARGS.NetBSD+= --with-gnu-as --with-as=/usr/bin/as +MAKE_ENV.NetBSD+= ac_cv_func_clock_gettime=yes + +CONFIGURE_ARGS.DragonFly+= --disable-bootstrap + .if ${OPSYS} == "Darwin" && !empty(OSX_SDK_PATH) CONFIGURE_ARGS+= --with-native-system-header-dir=${OSX_SDK_PATH}/usr/include # From FreeBSD, avoids compare issues with clang diff --git a/lang/gcc48/options.mk b/lang/gcc48/options.mk index ee7dbcaaa7a..0122b11514e 100644 --- a/lang/gcc48/options.mk +++ b/lang/gcc48/options.mk @@ -1,21 +1,15 @@ -# $NetBSD: options.mk,v 1.8 2015/01/27 04:46:06 dbj Exp $ +# $NetBSD: options.mk,v 1.9 2016/02/25 14:42:56 jperkin Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.${GCC_PKGNAME} PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-c++ gcc-fortran gcc-java \ gcc-go gcc-objc gcc-objc++ gcc-graphite PKG_SUGGESTED_OPTIONS= gcc-c++ gcc-fortran gcc-objc gcc-objc++ gcc-graphite -.if ${OPSYS} == "NetBSD" -PKG_SUGGESTED_OPTIONS+= nls -.elif ${OPSYS} == "Linux" -PKG_SUGGESTED_OPTIONS+= nls gcc-java -.elif ${OPSYS} == "DragonFly" -PKG_SUGGESTED_OPTIONS+= nls -.elif ${OPSYS} == "SunOS" -PKG_SUGGESTED_OPTIONS+= gcc-inplace-math -.else -PKG_SUGGESTED_OPTIONS+= gcc-java -.endif +PKG_SUGGESTED_OPTIONS.DragonFly+= nls +PKG_SUGGESTED_OPTIONS.Linux+= nls gcc-java +PKG_SUGGESTED_OPTIONS.NetBSD+= nls +PKG_SUGGESTED_OPTIONS.SunOS+= gcc-inplace-math +PKG_SUGGESTED_OPTIONS.*+= gcc-java ### ### Determine if multilib is avalible. @@ -132,13 +126,11 @@ PLIST_SRC+= PLIST.java PLIST_SUBST+= JAVA_NAME=${JAVA_NAME:Q} PLIST_SUBST+= JAVA_ARCH=${JAVA_ARCH:Q} -.if ${OPSYS} == "Darwin" -SUBST_CLASSES+= fix-dylib +SUBST_CLASSES.Darwin+= fix-dylib SUBST_STAGE.fix-dylib= pre-configure SUBST_MESSAGE.fix-dylib= Fixing java dylib symlink SUBST_FILES.fix-dylib= libjava/Makefile.in SUBST_SED.fix-dylib= -e 's,libjvm.so,libjvm.dylib,g' -.endif # Create a JPackage compatible SDK environment. CONFIGURE_ARGS+= --enable-java-home |