diff options
author | jlam <jlam@pkgsrc.org> | 2002-10-01 19:28:34 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2002-10-01 19:28:34 +0000 |
commit | d6aa01791f00050006672b68593d3cad0e7cf9ba (patch) | |
tree | 7f407c49a272dc9a362952a06795df687898b842 /x11/kdelibs3 | |
parent | fbb05ec995582aed9b909203e43a2564e627c3ca (diff) | |
download | pkgsrc-d6aa01791f00050006672b68593d3cad0e7cf9ba.tar.gz |
* Use EXPORT_DYNAMIC_LDFLAGS instead of hard-coding "-Wl,-export..."
* Checking the gcc version is unnecessary when using gcc/buildlink2.mk"
* buildlink2 allows the configure script to detect xml-config on its own;
we don't need to tell the script where it is through XML_CONFIG=...
Diffstat (limited to 'x11/kdelibs3')
-rw-r--r-- | x11/kdelibs3/Makefile | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index 14de7d05934..590a65b3d99 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2002/10/01 13:29:21 markd Exp $ +# $NetBSD: Makefile,v 1.9 2002/10/01 19:28:34 jlam Exp $ DISTNAME= kdelibs-3.0.3 PKGREVISION= 1 @@ -11,6 +11,7 @@ BUILDLINK_DEPENDS.audiofile= libaudiofile>=0.1.9 BUILDLINK_DEPENDS.qt3-libs= qt3-libs>=3.0.3 USE_BUILDLINK2= YES +USE_CXX= YES USE_OPENSSL_VERSION= ${OPENSSL_VERSION_096} CONFIGURE_ARGS+= --with-ssl-dir="${BUILDLINK_PREFIX.openssl}" @@ -18,18 +19,9 @@ CONFIGURE_ARGS+= --with-ssl-dir="${BUILDLINK_PREFIX.openssl}" .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "NetBSD" -LIBS+= -Wl,--export-dynamic +LIBS+= ${EXPORT_SYMBOLS_LDFLAGS} .endif -GCC_VERSION!= gcc --version -.if (${GCC_VERSION:C/-.*$$//} == egcs) && (${MACHINE_ARCH} == alpha) -.include "../../lang/gcc/buildlink2.mk" -.endif - -# The configure script looks for xml2-config in the environment as -# ${XML_CONFIG}, not as ${XML2_CONFIG} like it's supposed to. -# -CONFIGURE_ENV+= XML_CONFIG="${XML2_CONFIG}" KDEDIR= ${PREFIX} REPLACE_PERL= \ @@ -89,6 +81,9 @@ post-install: ${ECHO} "@dirrm share/kde"; \ ) > ${PLIST_SRC} +.if ${MACHINE_ARCH} == "alpha" +. include "../../lang/gcc/buildlink2.mk" +.endif .include "../../archivers/bzip2/buildlink2.mk" .include "../../audio/arts/buildlink2.mk" .include "../../audio/libaudiofile/buildlink2.mk" @@ -101,9 +96,10 @@ post-install: .include "../../x11/kde3/buildlink2.mk" .include "../../x11/qt3-libs/buildlink2.mk" .include "../../mk/ossaudio.buildlink2.mk" + .include "../../mk/bsd.pkg.mk" -# XXX On NetBSD, the egcs for: +# XXX On NetBSD, the gcc for: # XXX # XXX alpha # XXX |