diff options
| author | grant <grant> | 2003-09-28 05:27:06 +0000 |
|---|---|---|
| committer | grant <grant> | 2003-09-28 05:27:06 +0000 |
| commit | 1f42b8f43d590358c60aba8897e8d1e8c57640f4 (patch) | |
| tree | a1321a66a6ac80025b8bf123f68c5ab03fa8b635 /x11 | |
| parent | a6996cd487c78d4c511103791d357c6c8a7e4137 (diff) | |
| download | pkgsrc-1f42b8f43d590358c60aba8897e8d1e8c57640f4.tar.gz | |
only pass gcc specific flags if we are using gcc.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/qt3-libs/Makefile.common | 7 | ||||
| -rw-r--r-- | x11/qt3-libs/distinfo | 3 | ||||
| -rw-r--r-- | x11/qt3-libs/files/qmake.conf | 6 | ||||
| -rw-r--r-- | x11/qt3-libs/patches/patch-ah | 12 |
4 files changed, 22 insertions, 6 deletions
diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common index 6ba6dfc0d64..a2f76d79f31 100644 --- a/x11/qt3-libs/Makefile.common +++ b/x11/qt3-libs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.22 2003/09/28 01:34:40 grant Exp $ +# $NetBSD: Makefile.common,v 1.23 2003/09/28 05:27:06 grant Exp $ # DISTNAME= qt-x11-free-${QTVERSION} CATEGORIES= x11 @@ -27,7 +27,6 @@ CONFIGURE_ARGS+= -shared -sm -thread -no-stl \ -system-zlib -system-libpng \ -system-libmng -system-libjpeg CONFIGURE_ARGS+= -qt-gif # qt3 does not write compressed GIFs -CONFIGURE_ARGS+= -no-g++-exceptions CONFIGURE_ARGS+= < ${FILESDIR}/license-acceptance @@ -42,6 +41,10 @@ SCRIPTS_ENV+= HOME="${WRKDIR}" .include "../../mk/bsd.prefs.mk" +.if !empty(CC_VERSION:Mgcc*) +CONFIGURE_ARGS+= -no-g++-exceptions +.endif + .if ${OPSYS} == "SunOS" CONFIGURE_SCRIPT= ${SH} ./configure . if !empty(CC_VERSION:Mgcc*) diff --git a/x11/qt3-libs/distinfo b/x11/qt3-libs/distinfo index e66cddf2eea..f86bddfd6f8 100644 --- a/x11/qt3-libs/distinfo +++ b/x11/qt3-libs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2003/07/22 17:17:19 drochner Exp $ +$NetBSD: distinfo,v 1.15 2003/09/28 05:27:06 grant Exp $ SHA1 (qt-x11-free-3.1.2.tar.bz2) = eddcf56d34c4ee98fd2b48be6b6aa32b66f302a5 Size (qt-x11-free-3.1.2.tar.bz2) = 13358932 bytes @@ -7,6 +7,7 @@ SHA1 (patch-ab) = 4dfee5c06bc322646465f43fe850126873d7bb75 SHA1 (patch-ac) = 842ac48bd9d1f8a4d92bdaf0ccd8f14a1b7c4512 SHA1 (patch-ad) = 5f3d133051a9894aa45df1b1a6e1d0b6d964c49c SHA1 (patch-ag) = 4b1d279a7ff1793eac7ca0c98df61f43a762d50a +SHA1 (patch-ah) = 4f608169d9b2fa190844bf2ab5efaae2ed28e7b2 SHA1 (patch-ba) = 0f5baae5501a83ea53e5d4df846bb1f338e4d802 SHA1 (patch-bb) = 5196eb7c63f33fc36fe3569273d6c7061aeb9dbb SHA1 (patch-bc) = 1dcf6b9583461525400bd62b625f8cf7f5b41a5f diff --git a/x11/qt3-libs/files/qmake.conf b/x11/qt3-libs/files/qmake.conf index 3753200b673..0bfd80073ce 100644 --- a/x11/qt3-libs/files/qmake.conf +++ b/x11/qt3-libs/files/qmake.conf @@ -1,5 +1,5 @@ -# $NetBSD: qmake.conf,v 1.9 2003/03/18 08:36:25 skrll Exp $ -# $Id: qmake.conf,v 1.9 2003/03/18 08:36:25 skrll Exp $ +# $NetBSD: qmake.conf,v 1.10 2003/09/28 05:27:06 grant Exp $ +# $Id: qmake.conf,v 1.10 2003/09/28 05:27:06 grant Exp $ # # qmake configuration for netbsd-g++ # @@ -15,7 +15,7 @@ QMAKE_YACC = @YACC@ QMAKE_YACCFLAGS = -d QMAKE_CFLAGS = @CFLAGS@ QMAKE_CFLAGS_DEPS = -M -QMAKE_CFLAGS_WARN_ON = -Wall -W +QMAKE_CFLAGS_WARN_ON = QMAKE_CFLAGS_WARN_OFF = QMAKE_CFLAGS_RELEASE = -O2 QMAKE_CFLAGS_DEBUG = -g diff --git a/x11/qt3-libs/patches/patch-ah b/x11/qt3-libs/patches/patch-ah new file mode 100644 index 00000000000..112b3064beb --- /dev/null +++ b/x11/qt3-libs/patches/patch-ah @@ -0,0 +1,12 @@ +$NetBSD: patch-ah,v 1.1 2003/09/28 05:27:30 grant Exp $ + +--- configure.orig 2003-02-11 14:19:48.000000000 +1100 ++++ configure +@@ -501,7 +501,6 @@ while [ "$#" -gt 0 ]; do + CFG_EXCEPTION_SUPPORT=no + QMAKE_VARS="$QMAKE_VARS \"QMAKE_CFLAGS+=-fno-exceptions\"" + QMAKE_VARS="$QMAKE_VARS \"QMAKE_CXXFLAGS+=-fno-exceptions\"" +- QMAKE_VARS="$QMAKE_VARS \"QMAKE_LFLAGS+=-fno-exceptions\"" + else + UNKNOWN_OPT=yes + fi |