summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorreed <reed>2005-05-18 22:35:04 +0000
committerreed <reed>2005-05-18 22:35:04 +0000
commit36ce54042a905d0a119a5ecf04fffb0ca0f4b6df (patch)
treea9c506cabc27a3029de86ce1d940ec86d0aedfad
parentf364d5429083b27d56a65625dc564b55aa47da44 (diff)
downloadpkgsrc-36ce54042a905d0a119a5ecf04fffb0ca0f4b6df.tar.gz
Remove Linux work-around for bug noted in PR #25402 from arts
and koffice build. And do in meta-pkgs/kde3/kde3.mk as suggested by maintainer, markd. It helps with builds on Linux for kdegraphics3, libkipi, gwenview, kdelibs3, kdebase3, arts, and many other KDE-based packages on Linux. (It was not needed for kile, but will be used.) Thank you, Torsten Harenberg for testing many packages such as kdenetwork, kdegames, kdepim, kdemultimedia. I still don't know what the correct fix is for PR #25402.
-rw-r--r--audio/arts/Makefile8
-rw-r--r--meta-pkgs/kde3/kde3.mk7
-rw-r--r--misc/koffice/Makefile9
3 files changed, 8 insertions, 16 deletions
diff --git a/audio/arts/Makefile b/audio/arts/Makefile
index 3cdf142d58b..caba7a86dac 100644
--- a/audio/arts/Makefile
+++ b/audio/arts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/04/29 13:49:02 reed Exp $
+# $NetBSD: Makefile,v 1.41 2005/05/18 22:35:04 reed Exp $
DISTNAME= arts-1.4.0
CATEGORIES= audio
@@ -17,12 +17,6 @@ LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS}
_IN_ARTS_BUILD= yes
.include "../../meta-pkgs/kde3/kde3.mk"
-.if ${OPSYS} == "Linux"
-# workaround bug noted in PR #25402
-BUILDLINK_TRANSFORM+= rm:-Wl,--allow-shlib-undefined
-BUILDLINK_TRANSFORM+= rm:-Wl,--no-undefined
-.endif
-
.include "../../audio/esound/buildlink3.mk"
.include "../../audio/libaudiofile/buildlink3.mk"
.include "../../audio/libmad/buildlink3.mk"
diff --git a/meta-pkgs/kde3/kde3.mk b/meta-pkgs/kde3/kde3.mk
index 4b8140a6cd7..70f9bedf09e 100644
--- a/meta-pkgs/kde3/kde3.mk
+++ b/meta-pkgs/kde3/kde3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: kde3.mk,v 1.7 2005/04/27 02:09:05 markd Exp $
+# $NetBSD: kde3.mk,v 1.8 2005/05/18 22:35:04 reed Exp $
#
# This Makefile fragment is included by packages that use the KDE3
# configure-and-build process.
@@ -42,6 +42,11 @@ USE_PKGLOCALEDIR= YES
.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "Linux"
+# work-around bug noted in PR #25402
+BUILDLINK_TRANSFORM+= rm:-Wl,--no-undefined
+.endif
+
.if ${OPSYS} == "SunOS"
GCC_REQD+= 3.3
.endif
diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile
index 88c30b03cca..2e86f906d7a 100644
--- a/misc/koffice/Makefile
+++ b/misc/koffice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2005/05/12 18:31:20 reed Exp $
+# $NetBSD: Makefile,v 1.57 2005/05/18 22:35:04 reed Exp $
DISTNAME= koffice-1.3.5
PKGREVISION= 4
@@ -20,13 +20,6 @@ USE_LIBTOOL= YES
GCC_REQD+= 2.95.3
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Linux"
-# workaround bug noted in PR #25402
-BUILDLINK_TRANSFORM+= rm:-Wl,--no-undefined
-.endif
-
PTHREAD_OPTS+= require
PYTHON_VERSIONS_ACCEPTED= 24 23 # needs shared library