pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/qt3-libs add a test for CC_VERSION to correctly ch...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/bd2e62d8685e
branches:  trunk
changeset: 462210:bd2e62d8685e
user:      grant <grant%pkgsrc.org@localhost>
date:      Sun Sep 28 01:34:40 2003 +0000

description:
add a test for CC_VERSION to correctly choose SunPro. fix another
gcc version test.

diffstat:

 x11/qt3-libs/Makefile.common |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (31 lines):

diff -r 93727186d38e -r bd2e62d8685e x11/qt3-libs/Makefile.common
--- a/x11/qt3-libs/Makefile.common      Sat Sep 27 23:48:25 2003 +0000
+++ b/x11/qt3-libs/Makefile.common      Sun Sep 28 01:34:40 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2003/08/02 04:24:59 grant Exp $
+# $NetBSD: Makefile.common,v 1.22 2003/09/28 01:34:40 grant Exp $
 #
 DISTNAME=              qt-x11-free-${QTVERSION}
 CATEGORIES=            x11
@@ -44,7 +44,11 @@
 
 .if ${OPSYS} == "SunOS"
 CONFIGURE_SCRIPT=      ${SH} ./configure
+.  if !empty(CC_VERSION:Mgcc*)
 CONFIGURE_ARGS+=       -platform solaris-g++
+.  else
+CONFIGURE_ARGS+=       -platform solaris-cc
+.  endif
 SYS_LIBS=              -lresolv -lsocket -lnsl
 .endif
 
@@ -59,8 +63,7 @@
 # uces buggy code.
 #
 
-GCC_VERSION!=           ${CXX} --version
-.if (${GCC_VERSION:C/-.*$$//} == egcs)
+.if !empty(CC_VERSION:Mgcc-2.8*)
 CXXFLAGS+=             -DQ_INLINE_TEMPLATES=inline
 .endif
 



Home | Main Index | Thread Index | Old Index