diff options
| author | skrll <skrll@pkgsrc.org> | 2002-09-20 09:15:26 +0000 |
|---|---|---|
| committer | skrll <skrll@pkgsrc.org> | 2002-09-20 09:15:26 +0000 |
| commit | cc3ff1851c5adcbdef3ffff05624811b8a6b48c2 (patch) | |
| tree | 9e31192207cae3512a91ef7f19f49d65680db171 | |
| parent | b33fe97bdc8617c8312f96d89520728faa201e04 (diff) | |
| download | pkgsrc-cc3ff1851c5adcbdef3ffff05624811b8a6b48c2.tar.gz | |
Fix pkg/18211 from Hume Smith
Reverse the change to how templates are handled, made between 3.0.4
and 3.0.5, for older toolchains. Removing inline for newer toolchains
produces smaller code. Removing inline for older toolchains produces
buggy code.
Do some reorganisation while I'm here.
| -rw-r--r-- | x11/qt3-libs/Makefile.common | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common index c577ebe77a5..5b94ba0396f 100644 --- a/x11/qt3-libs/Makefile.common +++ b/x11/qt3-libs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2002/08/28 08:33:07 skrll Exp $ +# $NetBSD: Makefile.common,v 1.8 2002/09/20 09:15:26 skrll Exp $ # DISTNAME= qt-x11-free-${QTVERSION} CATEGORIES= x11 @@ -7,6 +7,10 @@ MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \ .include "../qt3/Makefile.common" +DISTINFO_FILE= ${.CURDIR}/../../x11/qt3-libs/distinfo +FILESDIR= ${.CURDIR}/../../x11/qt3-libs/files +PATCHDIR= ${.CURDIR}/../../x11/qt3-libs/patches + HAS_CONFIGURE= yes USE_X11BASE= yes USE_GMAKE= yes @@ -29,22 +33,30 @@ MAKE_ENV+= QTDIR="${WRKSRC}" # directory SCRIPTS_ENV+= HOME="${WRKDIR}" +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "SunOS" +BUILD_DEPENDS+= egcs-1.1.2:../../lang/egcs +CXX= ${LOCALBASE}/egcs/bin/g++ +CONFIGURE_ARGS+= -platform solaris-g++ +.endif + # # A cheat so that we don't have to set QTDIR at run-time to find the # plugins. # CXXFLAGS+= -DQT_INSTALL_PLUGINS=\\"${QTPREFIX}/plugins\\" -DISTINFO_FILE= ${.CURDIR}/../../x11/qt3-libs/distinfo -FILESDIR= ${.CURDIR}/../../x11/qt3-libs/files -PATCHDIR= ${.CURDIR}/../../x11/qt3-libs/patches - -.include "../../mk/bsd.prefs.mk" +# +# Reverse the change to how templates are handled made between 3.0.4 +# and 3.0.5 for older toolchains. Removing inline for newer toolchains +# produces smaller code. Removing inline for older toolchains prod- +# uces buggy code. +# -.if ${OPSYS} == "SunOS" -BUILD_DEPENDS+= egcs-1.1.2:../../lang/egcs -CXX= ${LOCALBASE}/egcs/bin/g++ -CONFIGURE_ARGS+= -platform solaris-g++ +GCC_VERSION!= ${CXX} --version +.if (${GCC_VERSION:C/-.*$$//} == egcs) +CXXFLAGS+= -DQ_INLINE_TEMPLATES=inline .endif post-patch: |