pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Include "../../mk/compiler.mk" to get the value of CC_...
details: https://anonhg.NetBSD.org/pkgsrc/rev/aa4a9edefdd0
branches: trunk
changeset: 468982:aa4a9edefdd0
user: jlam <jlam%pkgsrc.org@localhost>
date: Wed Feb 18 13:33:40 2004 +0000
description:
Include "../../mk/compiler.mk" to get the value of CC_VERSION before
testing it.
diffstat:
archivers/bzip2/Makefile | 4 ++--
audio/festival/Makefile | 4 ++--
devel/astyle/Makefile | 4 ++--
editors/lyx-qt/Makefile.common | 4 ++--
emulators/uae/Makefile | 4 ++--
emulators/xmame/Makefile | 3 ++-
emulators/xmess/Makefile | 4 +++-
lang/gcc3-c/Makefile | 4 +++-
lang/perl58/Makefile | 4 +++-
math/octave/Makefile | 6 +++---
multimedia/flashplayer/Makefile | 6 ++++--
multimedia/kdemultimedia3/Makefile | 4 ++--
parallel/mpi-ch/Makefile | 4 +++-
textproc/icu/Makefile | 4 ++--
textproc/sablotron/Makefile | 4 ++--
textproc/sp/Makefile | 22 +++++++++++-----------
time/plan/Makefile | 4 ++--
www/apache/Makefile | 4 +++-
www/apache6/Makefile | 4 +++-
www/galeon/Makefile | 9 +++++----
www/mozilla/Makefile.common | 3 ++-
x11/qt3-libs/Makefile.common | 4 ++--
x11/xscreensaver/Makefile.common | 3 ++-
23 files changed, 67 insertions(+), 49 deletions(-)
diffs (truncated from 456 to 300 lines):
diff -r a02db6b7a24d -r aa4a9edefdd0 archivers/bzip2/Makefile
--- a/archivers/bzip2/Makefile Wed Feb 18 13:32:38 2004 +0000
+++ b/archivers/bzip2/Makefile Wed Feb 18 13:33:40 2004 +0000
@@ -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_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 -r a02db6b7a24d -r aa4a9edefdd0 audio/festival/Makefile
--- a/audio/festival/Makefile Wed Feb 18 13:32:38 2004 +0000
+++ b/audio/festival/Makefile Wed Feb 18 13:33:40 2004 +0000
@@ -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 @@
FHOME= ${PREFIX}/share/festival
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/compiler.mk"
.if !empty(PKGSRC_COMPILER:Msunpro)
PKG_COMPILER?= suncc
diff -r a02db6b7a24d -r aa4a9edefdd0 devel/astyle/Makefile
--- a/devel/astyle/Makefile Wed Feb 18 13:32:38 2004 +0000
+++ b/devel/astyle/Makefile Wed Feb 18 13:33:40 2004 +0000
@@ -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 @@
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 -r a02db6b7a24d -r aa4a9edefdd0 editors/lyx-qt/Makefile.common
--- a/editors/lyx-qt/Makefile.common Wed Feb 18 13:32:38 2004 +0000
+++ b/editors/lyx-qt/Makefile.common Wed Feb 18 13:33:40 2004 +0000
@@ -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 @@
--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 -r a02db6b7a24d -r aa4a9edefdd0 emulators/uae/Makefile
--- a/emulators/uae/Makefile Wed Feb 18 13:32:38 2004 +0000
+++ b/emulators/uae/Makefile Wed Feb 18 13:33:40 2004 +0000
@@ -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 @@
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 -r a02db6b7a24d -r aa4a9edefdd0 emulators/xmame/Makefile
--- a/emulators/xmame/Makefile Wed Feb 18 13:32:38 2004 +0000
+++ b/emulators/xmame/Makefile Wed Feb 18 13:33:40 2004 +0000
@@ -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 @@
. 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 -r a02db6b7a24d -r aa4a9edefdd0 emulators/xmess/Makefile
--- a/emulators/xmess/Makefile Wed Feb 18 13:32:38 2004 +0000
+++ b/emulators/xmess/Makefile Wed Feb 18 13:33:40 2004 +0000
@@ -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 @@
. 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 -r a02db6b7a24d -r aa4a9edefdd0 lang/gcc3-c/Makefile
--- a/lang/gcc3-c/Makefile Wed Feb 18 13:32:38 2004 +0000
+++ b/lang/gcc3-c/Makefile Wed Feb 18 13:33:40 2004 +0000
@@ -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 @@
CONFIGURE_ARGS+= --enable-languages=c
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
+.include "../../mk/compiler.mk"
+
.if empty(CC_VERSION:Mgcc-*)
ALL_TARGET= bootstrap
.endif
diff -r a02db6b7a24d -r aa4a9edefdd0 lang/perl58/Makefile
--- a/lang/perl58/Makefile Wed Feb 18 13:32:38 2004 +0000
+++ b/lang/perl58/Makefile Wed Feb 18 13:33:40 2004 +0000
@@ -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 @@
. endif
.endif
+.include "../../mk/compiler.mk"
+
.if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64)
. if !empty(CC_VERSION:Mgcc*)
. if !defined(_GCC_IS_TOO_OLD)
diff -r a02db6b7a24d -r aa4a9edefdd0 math/octave/Makefile
--- a/math/octave/Makefile Wed Feb 18 13:32:38 2004 +0000
+++ b/math/octave/Makefile Wed Feb 18 13:33:40 2004 +0000
@@ -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 @@
${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
+.if !empty(CC_VERSION:Mgcc-2.8.1)
post-patch:
-.if !empty(CC_VERSION:Mgcc-2.8.1)
@EGCS_VERSION=`${CC} -v 2>&1 | ${AWK} '{print $$4}'`; \
if [ $$EGCS_VERSION -lt 19981201 ]; then \
cd ${WRKSRC}; \
diff -r a02db6b7a24d -r aa4a9edefdd0 multimedia/flashplayer/Makefile
--- a/multimedia/flashplayer/Makefile Wed Feb 18 13:32:38 2004 +0000
+++ b/multimedia/flashplayer/Makefile Wed Feb 18 13:33:40 2004 +0000
@@ -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 @@
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 -r a02db6b7a24d -r aa4a9edefdd0 multimedia/kdemultimedia3/Makefile
--- a/multimedia/kdemultimedia3/Makefile Wed Feb 18 13:32:38 2004 +0000
+++ b/multimedia/kdemultimedia3/Makefile Wed Feb 18 13:33:40 2004 +0000
@@ -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 @@
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 -r a02db6b7a24d -r aa4a9edefdd0 parallel/mpi-ch/Makefile
--- a/parallel/mpi-ch/Makefile Wed Feb 18 13:32:38 2004 +0000
+++ b/parallel/mpi-ch/Makefile Wed Feb 18 13:33:40 2004 +0000
@@ -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+= --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 -r a02db6b7a24d -r aa4a9edefdd0 textproc/icu/Makefile
--- a/textproc/icu/Makefile Wed Feb 18 13:32:38 2004 +0000
+++ b/textproc/icu/Makefile Wed Feb 18 13:33:40 2004 +0000
@@ -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 @@
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 -r a02db6b7a24d -r aa4a9edefdd0 textproc/sablotron/Makefile
--- a/textproc/sablotron/Makefile Wed Feb 18 13:32:38 2004 +0000
+++ b/textproc/sablotron/Makefile Wed Feb 18 13:33:40 2004 +0000
@@ -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 @@
# 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 -r a02db6b7a24d -r aa4a9edefdd0 textproc/sp/Makefile
--- a/textproc/sp/Makefile Wed Feb 18 13:32:38 2004 +0000
+++ b/textproc/sp/Makefile Wed Feb 18 13:33:40 2004 +0000
@@ -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 @@
SGML_CATALOGS= ${PREFIX}/share/sgml/dtd/html.soc
+.include "../../mk/compiler.mk"
+
+.if !empty(CC_VERSION:Mgcc-2.8.1)
+post-patch:
+ @cd ${WRKSRC}; \
+ for FILE in ${PATCHDIR}/egcs-patch-*; do \
+ ${PATCH} ${PATCH_ARGS} < $$FILE; \
+ done
Home |
Main Index |
Thread Index |
Old Index