pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc Remove Linux work-around for bug noted in PR #25402 fr...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/fa84bd64bfb9
branches:  trunk
changeset: 494071:fa84bd64bfb9
user:      reed <reed%pkgsrc.org@localhost>
date:      Wed May 18 22:35:04 2005 +0000

description:
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.

diffstat:

 audio/arts/Makefile    |  8 +-------
 meta-pkgs/kde3/kde3.mk |  7 ++++++-
 misc/koffice/Makefile  |  9 +--------
 3 files changed, 8 insertions(+), 16 deletions(-)

diffs (66 lines):

diff -r cc341f4ac1fd -r fa84bd64bfb9 audio/arts/Makefile
--- a/audio/arts/Makefile       Wed May 18 22:09:52 2005 +0000
+++ b/audio/arts/Makefile       Wed May 18 22:35:04 2005 +0000
@@ -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 @@
 _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 -r cc341f4ac1fd -r fa84bd64bfb9 meta-pkgs/kde3/kde3.mk
--- a/meta-pkgs/kde3/kde3.mk    Wed May 18 22:09:52 2005 +0000
+++ b/meta-pkgs/kde3/kde3.mk    Wed May 18 22:35:04 2005 +0000
@@ -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 @@
 
 .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 -r cc341f4ac1fd -r fa84bd64bfb9 misc/koffice/Makefile
--- a/misc/koffice/Makefile     Wed May 18 22:09:52 2005 +0000
+++ b/misc/koffice/Makefile     Wed May 18 22:35:04 2005 +0000
@@ -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 @@
 
 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



Home | Main Index | Thread Index | Old Index