summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorgrant <grant@pkgsrc.org>2003-09-28 01:34:40 +0000
committergrant <grant@pkgsrc.org>2003-09-28 01:34:40 +0000
commitf200003b98b38b6f8611f48ec125284064c291fd (patch)
tree3bcb583289a89b83c8542517aa6fd6c1809b9253 /x11
parent832f129f53b19797dd6c3133ce4793b6d553ad3c (diff)
downloadpkgsrc-f200003b98b38b6f8611f48ec125284064c291fd.tar.gz
add a test for CC_VERSION to correctly choose SunPro. fix another
gcc version test.
Diffstat (limited to 'x11')
-rw-r--r--x11/qt3-libs/Makefile.common9
1 files changed, 6 insertions, 3 deletions
diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common
index 358e6c111d8..6ba6dfc0d64 100644
--- a/x11/qt3-libs/Makefile.common
+++ b/x11/qt3-libs/Makefile.common
@@ -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 @@ SCRIPTS_ENV+= HOME="${WRKDIR}"
.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 @@ CONFIGURE_ARGS+= -no-xinerama
# 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