diff options
author | jlam <jlam@pkgsrc.org> | 2004-02-18 13:33:40 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2004-02-18 13:33:40 +0000 |
commit | 9348f8afb55e7a29b329d4f03a1537ebbf7eb112 (patch) | |
tree | e6391a0a29cee2898ed380fe3328cb0b69890ce3 | |
parent | de7c1e27f8e47afeef59f84da3f9a58d0b526028 (diff) | |
download | pkgsrc-9348f8afb55e7a29b329d4f03a1537ebbf7eb112.tar.gz |
Include "../../mk/compiler.mk" to get the value of CC_VERSION before
testing it.
-rw-r--r-- | archivers/bzip2/Makefile | 4 | ||||
-rw-r--r-- | audio/festival/Makefile | 4 | ||||
-rw-r--r-- | devel/astyle/Makefile | 4 | ||||
-rw-r--r-- | editors/lyx-qt/Makefile.common | 4 | ||||
-rw-r--r-- | emulators/uae/Makefile | 4 | ||||
-rw-r--r-- | emulators/xmame/Makefile | 3 | ||||
-rw-r--r-- | emulators/xmess/Makefile | 4 | ||||
-rw-r--r-- | lang/gcc3-c/Makefile | 4 | ||||
-rw-r--r-- | lang/perl58/Makefile | 4 | ||||
-rw-r--r-- | math/octave/Makefile | 6 | ||||
-rw-r--r-- | multimedia/flashplayer/Makefile | 6 | ||||
-rw-r--r-- | multimedia/kdemultimedia3/Makefile | 4 | ||||
-rw-r--r-- | parallel/mpi-ch/Makefile | 4 | ||||
-rw-r--r-- | textproc/icu/Makefile | 4 | ||||
-rw-r--r-- | textproc/sablotron/Makefile | 4 | ||||
-rw-r--r-- | textproc/sp/Makefile | 18 | ||||
-rw-r--r-- | time/plan/Makefile | 4 | ||||
-rw-r--r-- | www/apache/Makefile | 4 | ||||
-rw-r--r-- | www/apache6/Makefile | 4 | ||||
-rw-r--r-- | www/galeon/Makefile | 9 | ||||
-rw-r--r-- | www/mozilla/Makefile.common | 3 | ||||
-rw-r--r-- | x11/qt3-libs/Makefile.common | 4 | ||||
-rw-r--r-- | x11/xscreensaver/Makefile.common | 3 |
23 files changed, 65 insertions, 47 deletions
diff --git a/archivers/bzip2/Makefile b/archivers/bzip2/Makefile index 5f98acebcb3..18428aa4f99 100644 --- a/archivers/bzip2/Makefile +++ b/archivers/bzip2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2004/02/08 04:03:15 jlam Exp $ +# $NetBSD: Makefile,v 1.33 2004/02/18 13:33:40 jlam Exp $ # DISTNAME= bzip2-1.0.2 @@ -15,7 +15,7 @@ USE_BUILDLINK3= yes USE_LIBTOOL= yes MAKE_ENV+= REALCC="${CC}" -.include "../../mk/bsd.prefs.mk" +.include "../../mk/compiler.mk" .if !empty(CC_VERSION:Mgcc*) BZIP_CFLAGS= -Wall -Winline -fomit-frame-pointer -fno-strength-reduce diff --git a/audio/festival/Makefile b/audio/festival/Makefile index 5d54ae3f9e3..25120c313eb 100644 --- a/audio/festival/Makefile +++ b/audio/festival/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2004/02/09 19:57:54 jlam Exp $ +# $NetBSD: Makefile,v 1.32 2004/02/18 13:33:40 jlam Exp $ DISTNAME= festival-1.4.1 PKGREVISION= 1 @@ -27,7 +27,7 @@ FESTIVAL= ${WRKSRC}/festival FHOME= ${PREFIX}/share/festival -.include "../../mk/bsd.prefs.mk" +.include "../../mk/compiler.mk" .if !empty(PKGSRC_COMPILER:Msunpro) PKG_COMPILER?= suncc diff --git a/devel/astyle/Makefile b/devel/astyle/Makefile index 40d665a4d7b..3a00b39ddab 100644 --- a/devel/astyle/Makefile +++ b/devel/astyle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/11/05 15:27:41 jmmv Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/18 13:33:40 jlam Exp $ # DISTNAME= astyle_1.13.6.1 @@ -13,7 +13,7 @@ COMMENT= Reindenter and reformatter of C++, C and Java source code HTMLDIR= ${PREFIX}/share/doc/html/astyle -.include "../../mk/bsd.prefs.mk" +.include "../../mk/compiler.mk" .if !empty(CC_VERSION:Mgcc-2*) CFLAGS+= -DASTYLE_GCC2 diff --git a/editors/lyx-qt/Makefile.common b/editors/lyx-qt/Makefile.common index a782ea75df3..7d5ed650622 100644 --- a/editors/lyx-qt/Makefile.common +++ b/editors/lyx-qt/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.14 2004/02/14 17:21:39 jlam Exp $ +# $NetBSD: Makefile.common,v 1.15 2004/02/18 13:33:40 jlam Exp $ # DISTNAME= lyx-1.3.3 @@ -34,7 +34,7 @@ CONFIGURE_ARGS+= --with-pspell-lib=${BUILDLINK_PREFIX.aspell}/lib \ --with-pspell-include=${BUILDLINK_PREFIX.aspell}/include/pspell \ --with-pspell -.include "../../mk/bsd.prefs.mk" +.include "../../mk/compiler.mk" # XXX these values are taken from the LyX configure script .if !empty(CC_VERSION:Mgcc-*) diff --git a/emulators/uae/Makefile b/emulators/uae/Makefile index 8aee445addd..3074c0aa47f 100644 --- a/emulators/uae/Makefile +++ b/emulators/uae/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2004/01/22 08:36:04 grant Exp $ +# $NetBSD: Makefile,v 1.29 2004/02/18 13:33:40 jlam Exp $ DISTNAME= uae-0.8.22 PKGNAME= ${DISTNAME} @@ -18,7 +18,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-dga --enable-vidmode --disable-ui -.include "../../mk/bsd.prefs.mk" +.include "../../mk/compiler.mk" .if !empty(CC_VERSION:Mgcc-3.*) post-configure: diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile index 585fd97d037..eb8403cf38c 100644 --- a/emulators/xmame/Makefile +++ b/emulators/xmame/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.104 2004/01/28 15:26:26 xtraeme Exp $ +# $NetBSD: Makefile,v 1.105 2004/02/18 13:33:41 jlam Exp $ # DISTNAME= xmame-0.78.1 @@ -78,6 +78,7 @@ MAKE_FLAGS+= JOY_USB=1 . endif .endif +.include "../../mk/compiler.mk" .if !empty(CC_VERSION:Mgcc-2*) # Prevent memory explosion for gcc 2.95 and older. MAKE_FLAGS+= LOW_MEM=1 diff --git a/emulators/xmess/Makefile b/emulators/xmess/Makefile index 2e8ac7cf5eb..f523c781848 100644 --- a/emulators/xmess/Makefile +++ b/emulators/xmess/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2004/01/28 15:41:07 xtraeme Exp $ +# $NetBSD: Makefile,v 1.46 2004/02/18 13:33:41 jlam Exp $ # DISTNAME= xmame-0.78.1 @@ -79,6 +79,8 @@ MAKE_FLAGS+= JOY_USB=1 . endif .endif +.include "../../mk/compiler.mk" + .if !empty(CC_VERSION:Mgcc-2*) # Prevent memory explosion for gcc 2.95 and older. MAKE_FLAGS+= LOW_MEM=1 diff --git a/lang/gcc3-c/Makefile b/lang/gcc3-c/Makefile index 794cc639caf..27cb559623b 100644 --- a/lang/gcc3-c/Makefile +++ b/lang/gcc3-c/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/02/01 14:05:46 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2004/02/18 13:33:41 jlam Exp $ PKGNAME= gcc3${GCC3_PKGMODIF}-c-${GCC_VERSION} COMMENT= GNU Compiler Collection, v3 - C compiler @@ -11,6 +11,8 @@ INFO_FILES= cpp.info gcc.info gccint.info cppinternals.info CONFIGURE_ARGS+= --enable-languages=c PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC +.include "../../mk/compiler.mk" + .if empty(CC_VERSION:Mgcc-*) ALL_TARGET= bootstrap .endif diff --git a/lang/perl58/Makefile b/lang/perl58/Makefile index 189c5096b02..7467d95e2fa 100644 --- a/lang/perl58/Makefile +++ b/lang/perl58/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2004/02/10 01:59:54 jlam Exp $ +# $NetBSD: Makefile,v 1.37 2004/02/18 13:33:41 jlam Exp $ # The following two variables should have empty values unless we're # building a perl snapshot or release candidate. @@ -162,6 +162,8 @@ MKPIC= no . endif .endif +.include "../../mk/compiler.mk" + .if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) . if !empty(CC_VERSION:Mgcc*) . if !defined(_GCC_IS_TOO_OLD) diff --git a/math/octave/Makefile b/math/octave/Makefile index 72bf400ca98..fb307feb42d 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2004/02/09 03:26:39 jlam Exp $ +# $NetBSD: Makefile,v 1.45 2004/02/18 13:33:41 jlam Exp $ # FreeBSD Id: Makefile,v 1.18 1998/09/27 20:10:45 steve Exp DISTNAME= octave-2.0.17 @@ -49,14 +49,14 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/doc/refcard/refcard-a4.ps ${PREFIX}/share/octave/2.0.17/doc ${INSTALL_DATA} ${WRKSRC}/doc/faq/Octave-FAQ.ps ${PREFIX}/share/octave/2.0.17/doc -.include "../../mk/bsd.prefs.mk" +.include "../../mk/compiler.mk" .if !empty(CC_VERSION:Mgcc-3*) PKG_FAIL_REASON= "Octave does not build with ${CC_VERSION} - please use octave-current." .endif -post-patch: .if !empty(CC_VERSION:Mgcc-2.8.1) +post-patch: @EGCS_VERSION=`${CC} -v 2>&1 | ${AWK} '{print $$4}'`; \ if [ $$EGCS_VERSION -lt 19981201 ]; then \ cd ${WRKSRC}; \ diff --git a/multimedia/flashplayer/Makefile b/multimedia/flashplayer/Makefile index 3a451c48432..4e25096ae97 100644 --- a/multimedia/flashplayer/Makefile +++ b/multimedia/flashplayer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/01/26 13:36:18 jmmv Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/18 13:33:41 jlam Exp $ # .include "../../multimedia/libflash/Makefile.common" @@ -11,7 +11,9 @@ USE_BUILDLINK2= yes BUILD_DIRS= ${WRKSRC}/Player CPPFLAGS+= -DDEV_DSP=\\\"${DEVOSSSOUND}\\\" -.if defined(CC_VERSION) && !empty(CC_VERSION:Mgcc-3.*) +.include "../../mk/compiler.mk" + +.if !empty(CC_VERSION:Mgcc-3.*) MAKE_ENV+= LIBSTDCPP=-lstdc++ .else MAKE_ENV+= LIBSTDCPP= diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile index e636097d2af..f2ea959863b 100644 --- a/multimedia/kdemultimedia3/Makefile +++ b/multimedia/kdemultimedia3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2004/02/15 12:18:51 markd Exp $ +# $NetBSD: Makefile,v 1.6 2004/02/18 13:33:41 jlam Exp $ DISTNAME= kdemultimedia-${_KDE_VERSION} PKGREVISION= 1 @@ -16,7 +16,7 @@ USE_BUILDLINK2= YES REPLACE_PERL= kscd/workman2cddb.pl -.include "../../mk/bsd.prefs.mk" +.include "../../mk/compiler.mk" .if !empty(CC_VERSION:Mgcc-3.*) BUILDLINK_DEPENDS.xine-lib= xine-lib>=1rc0anb1 .endif diff --git a/parallel/mpi-ch/Makefile b/parallel/mpi-ch/Makefile index c3916460898..cabb3cfb78b 100644 --- a/parallel/mpi-ch/Makefile +++ b/parallel/mpi-ch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2003/12/03 21:06:17 jschauma Exp $ +# $NetBSD: Makefile,v 1.26 2004/02/18 13:33:41 jlam Exp $ DISTNAME= mpich-1.2.5.2 CATEGORIES= parallel @@ -35,6 +35,8 @@ CONFIGURE_ARGS+= --with-mpe CONFIGURE_ARGS+= --disable-devdebug CONFIGURE_ARGS+= --disable-f90 CONFIGURE_ARGS+= --disable-f90modules + +.include "../../mk/compiler.mk" .if !empty(CC_VERSION:Mgcc-3*) CONFIGURE_ARGS+= --disable-weak-symbols .endif diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile index 56fd129024a..fc09f12cc40 100644 --- a/textproc/icu/Makefile +++ b/textproc/icu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2004/01/24 15:13:20 grant Exp $ +# $NetBSD: Makefile,v 1.29 2004/02/18 13:33:41 jlam Exp $ # DISTNAME= icu-2.6.1 @@ -37,7 +37,7 @@ SUPPORT_FILES+= ${PREFIX}/share/examples/icu/convrtrs.txt \ CONFIGURE_ARGS+= --disable-threads .endif -.include "../../mk/bsd.prefs.mk" +.include "../../mk/compiler.mk" .if !empty(CC_VERSION:Mgcc-3*) CXXFLAGS:= ${CXXFLAGS:C/-O[0-9]*/-O/g} diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile index 0618267b728..49395aea02e 100644 --- a/textproc/sablotron/Makefile +++ b/textproc/sablotron/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2004/02/14 17:21:53 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2004/02/18 13:33:41 jlam Exp $ DISTNAME= Sablot-1.0.1 PKGNAME= ${DISTNAME:S/Sablot/sablotron/} @@ -21,7 +21,7 @@ USE_LIBTOOL= YES # buildlink2 finds. LIBS+= ${_BLNK_ICONV_LDFLAGS} -.include "../../mk/bsd.prefs.mk" +.include "../../mk/compiler.mk" # both libstdc++ and libm are required for gcc 2.95.x, as libstdc++ # does not include the math functions. gcc3 only needs libstdc++. diff --git a/textproc/sp/Makefile b/textproc/sp/Makefile index a4bc190a1de..94374d51f28 100644 --- a/textproc/sp/Makefile +++ b/textproc/sp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2004/02/09 03:26:39 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2004/02/18 13:33:41 jlam Exp $ # DISTNAME= sp-1.3.4 @@ -25,21 +25,21 @@ MAKE_ENV+= SGML_DEFAULT_CATALOG="${SGML_DEFAULT_CATALOG}" SGML_CATALOGS= ${PREFIX}/share/sgml/dtd/html.soc -post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sp ${PREFIX}/share/sgml/dtd - cd ${WRKSRC}/doc; for n in *.htm ; do ${INSTALL_DATA} $$n ${PREFIX}/share/doc/sp/$n ; done - cd ${WRKSRC}/pubtext; for n in * ; do ${INSTALL_DATA} $$n ${PREFIX}/share/sgml/dtd/$n ; done - cd ${WRKSRC}/lib; ${INSTALL_DATA} libsp.a ${PREFIX}/lib/libsp.a - -.include "../../mk/bsd.prefs.mk" +.include "../../mk/compiler.mk" -post-patch: .if !empty(CC_VERSION:Mgcc-2.8.1) +post-patch: @cd ${WRKSRC}; \ for FILE in ${PATCHDIR}/egcs-patch-*; do \ ${PATCH} ${PATCH_ARGS} < $$FILE; \ done .endif +post-install: + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sp ${PREFIX}/share/sgml/dtd + cd ${WRKSRC}/doc; for n in *.htm ; do ${INSTALL_DATA} $$n ${PREFIX}/share/doc/sp/$n ; done + cd ${WRKSRC}/pubtext; for n in * ; do ${INSTALL_DATA} $$n ${PREFIX}/share/sgml/dtd/$n ; done + cd ${WRKSRC}/lib; ${INSTALL_DATA} libsp.a ${PREFIX}/lib/libsp.a + .include "../../textproc/xmlcatmgr/catalogs.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/plan/Makefile b/time/plan/Makefile index e3fa182cb27..687f4a0364b 100644 --- a/time/plan/Makefile +++ b/time/plan/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2004/01/20 12:27:16 agc Exp $ +# $NetBSD: Makefile,v 1.16 2004/02/18 13:33:41 jlam Exp $ DISTNAME= plan-1.8.4 CATEGORIES= x11 time @@ -13,7 +13,7 @@ USE_BUILDLINK2= YES USE_X11BASE= YES ALL_TARGET= netbsd -.include "../../mk/bsd.prefs.mk" +.include "../../mk/compiler.mk" .if !empty(CC_VERSION:Mgcc-3.*) post-configure: diff --git a/www/apache/Makefile b/www/apache/Makefile index 57f11437b0b..df67509f189 100644 --- a/www/apache/Makefile +++ b/www/apache/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.137 2004/02/09 19:57:55 jlam Exp $ +# $NetBSD: Makefile,v 1.138 2004/02/18 13:33:41 jlam Exp $ # # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of # code hooks that allow mod_ssl to be compiled separately later, if desired). @@ -101,6 +101,8 @@ LDFLAGS+= ${COMPILER_PERFTUNE_FLAGS} APACHE_CUSTOM_CFLAGS+= -D_LARGEFILE_SOURCE APACHE_CUSTOM_CFLAGS+= -D_FILE_OFFSET_BITS=64 +.include "../../mk/compiler.mk" + # On NetBSD ELF platforms, we need to link libgcc.a whole-archive so that # certain symbols from the C++ implementation (__get_eh_context, etc.) # referenced by DSOs written in C++ will resolve correctly. diff --git a/www/apache6/Makefile b/www/apache6/Makefile index 991db11590a..f7e71fd412b 100644 --- a/www/apache6/Makefile +++ b/www/apache6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.87 2004/02/09 19:57:55 jlam Exp $ +# $NetBSD: Makefile,v 1.88 2004/02/18 13:33:41 jlam Exp $ # # This package does not compile in mod_ssl support hooks, as it conflicts # with IPv6-enable patch. @@ -103,6 +103,8 @@ APACHE_CUSTOM_CFLAGS+= -O6 -fomit-frame-pointer -fexpensive-optimizations APACHE_CUSTOM_CFLAGS+= -D_LARGEFILE_SOURCE APACHE_CUSTOM_CFLAGS+= -D_FILE_OFFSET_BITS=64 +.include "../../mk/compiler.mk" + # On NetBSD ELF platforms, we need to link libgcc.a whole-archive so that # certain symbols from the C++ implementation (__get_eh_context, etc.) # referenced by DSOs written in C++ will resolve correctly. diff --git a/www/galeon/Makefile b/www/galeon/Makefile index 12dcb63a711..f77454a45f2 100644 --- a/www/galeon/Makefile +++ b/www/galeon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.62 2004/02/14 17:21:54 jlam Exp $ +# $NetBSD: Makefile,v 1.63 2004/02/18 13:33:41 jlam Exp $ DISTNAME= galeon-1.2.13 PKGREVISION= 2 @@ -51,9 +51,7 @@ LDFLAGS+= -Wl,${RPATH_FLAG}${MOZ_LIBDIR} # Ensure we export symbols in the linked shared object. LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS} -pre-install: - ${GCONF_PREFIX}/bin/gconftool --shutdown - +.include "../../mk/compiler.mk" .if !empty(CC_VERSION:Mgcc-3*) # Workaround for gcc3 build issue post-buildlink: @@ -62,6 +60,9 @@ post-buildlink: > ${BUILDLINK_DIR}/bin/cc .endif +pre-install: + ${GCONF_PREFIX}/bin/gconftool --shutdown + post-install: ${SED} -e "s,@PREFIX@,${PREFIX},g" -e "s,@MOZILLA_PREFIX@,${MOZILLA_PREFIX},g" ${FILESDIR}/galeon.in > ${PREFIX}/bin/galeon ${CHOWN} ${BINOWN} ${PREFIX}/bin/galeon diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common index 52af801c175..7bcb2f42916 100644 --- a/www/mozilla/Makefile.common +++ b/www/mozilla/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.33 2004/02/14 18:26:29 jmmv Exp $ +# $NetBSD: Makefile.common,v 1.34 2004/02/18 13:33:41 jlam Exp $ MOZ_DIST_VER?= ${MOZ_VER} DISTNAME?= mozilla-source-${MOZ_DIST_VER} @@ -122,6 +122,7 @@ SCRIPTS_ENV+= SUNOSLIB=${SUNOSLIB} PTHREAD_OPTS+= native optional +.include "../../mk/compiler.mk" .if !empty(CC_VERSION:Mgcc*) COPTS?= -O2 .endif diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common index 76b32a012cc..7d9b51f9d57 100644 --- a/x11/qt3-libs/Makefile.common +++ b/x11/qt3-libs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.28 2004/02/08 04:03:15 jlam Exp $ +# $NetBSD: Makefile.common,v 1.29 2004/02/18 13:33:41 jlam Exp $ # DISTNAME= qt-x11-free-${QTVERSION} CATEGORIES= x11 @@ -39,7 +39,7 @@ MAKE_ENV+= QTDIR="${WRKSRC}" # directory SCRIPTS_ENV+= HOME="${WRKDIR}" -.include "../../mk/bsd.prefs.mk" +.include "../../mk/compiler.mk" .if !empty(CC_VERSION:Mgcc*) CONFIGURE_ARGS+= -no-g++-exceptions diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common index 10b72709282..4e00bb38d77 100644 --- a/x11/xscreensaver/Makefile.common +++ b/x11/xscreensaver/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.70 2004/02/06 19:04:25 jlam Exp $ +# $NetBSD: Makefile.common,v 1.71 2004/02/18 13:33:41 jlam Exp $ # DISTNAME= xscreensaver-4.14 @@ -61,6 +61,7 @@ CONFIGURE_ARGS+= --without-kerberos . endif .endif +.include "../../mk/compiler.mk" .if !empty(CC_VERSION:Mgcc*) CFLAGS+= -fno-strict-aliasing .endif |