[pkgsrc/trunk]: pkgsrc Apply removal of -export-dynamic for SunOS across all ...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0fbc9fb30fca
branches:  trunk
changeset: 621164:0fbc9fb30fca
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Fri Jul 05 15:10:00 2013 +0000

description:
Apply removal of -export-dynamic for SunOS across all of pkgsrc.

Avoids lots of copy/paste and fixes a bunch of packages which hadn't been
looked at yet.

diffstat:

 audio/albumplayer/Makefile       |  7 +------
 audio/audacious-plugins/Makefile |  3 +--
 audio/glurp/Makefile             |  7 +------
 audio/moc-devel/Makefile         |  7 +------
 audio/moc/Makefile               |  7 +------
 cad/gplcver/Makefile             |  7 +------
 chat/pidgin-latex/Makefile       |  7 +------
 mk/platform/SunOS.mk             |  6 +++++-
 wm/awesome/Makefile              |  9 ++-------
 9 files changed, 14 insertions(+), 46 deletions(-)

diffs (186 lines):

diff -r 0e83b099a42a -r 0fbc9fb30fca audio/albumplayer/Makefile
--- a/audio/albumplayer/Makefile        Fri Jul 05 14:51:43 2013 +0000
+++ b/audio/albumplayer/Makefile        Fri Jul 05 15:10:00 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2013/06/06 12:54:01 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2013/07/05 15:10:00 jperkin Exp $
 #
 
 DISTNAME=      albumplayer-0.3.1
@@ -19,11 +19,6 @@
 INSTALLATION_DIRS+=    share/applications
 REPLACE_SH=            ap_flac_embed
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "SunOS"
-BUILDLINK_TRANSFORM+=  rm:-export-dynamic
-.endif
-
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../multimedia/gstreamer0.10/buildlink3.mk"
diff -r 0e83b099a42a -r 0fbc9fb30fca audio/audacious-plugins/Makefile
--- a/audio/audacious-plugins/Makefile  Fri Jul 05 14:51:43 2013 +0000
+++ b/audio/audacious-plugins/Makefile  Fri Jul 05 15:10:00 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2013/07/05 13:29:28 ryoon Exp $
+# $NetBSD: Makefile,v 1.46 2013/07/05 15:10:00 jperkin Exp $
 #
 
 DISTNAME=              audacious-plugins-1.5.1
@@ -55,7 +55,6 @@
 .elif ${OPSYS} == "DragonFly"
 PLIST.oss=     yes
 .elif ${OPSYS} == "SunOS"
-BUILDLINK_TRANSFORM+=  rm:-Wl,-export-dynamic
 CPPFLAGS.SunOS=        -D__EXTENSIONS__ -D__uint32_t=uint32_t -D__uint64_t=uint64_t
 CONFIGURE_ARGS+=       --enable-oss4
 PLIST.oss4=    yes
diff -r 0e83b099a42a -r 0fbc9fb30fca audio/glurp/Makefile
--- a/audio/glurp/Makefile      Fri Jul 05 14:51:43 2013 +0000
+++ b/audio/glurp/Makefile      Fri Jul 05 15:10:00 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2013/06/06 12:54:03 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2013/07/05 15:10:00 jperkin Exp $
 #
 
 DISTNAME=      glurp-0.12.3
@@ -16,11 +16,6 @@
 
 LIBS.SunOS+=   -lsocket -lnsl
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "SunOS"
-BUILDLINK_TRANSFORM+=  rm:-export-dynamic
-.endif
-
 .include "../../audio/libmpd/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"
diff -r 0e83b099a42a -r 0fbc9fb30fca audio/moc-devel/Makefile
--- a/audio/moc-devel/Makefile  Fri Jul 05 14:51:43 2013 +0000
+++ b/audio/moc-devel/Makefile  Fri Jul 05 15:10:00 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2013/02/17 10:14:11 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2013/07/05 15:10:00 jperkin Exp $
 
 DISTNAME=              moc-2.5.0-beta1
 PKGNAME=               ${DISTNAME:S/-beta/b/:moc%=moc-devel%}
@@ -35,11 +35,6 @@
 post-extract:
        ${CP} ${FILESDIR}/getline.c ${WRKSRC}
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "SunOS"
-BUILDLINK_TRANSFORM+=   rm:-Wl,--export-dynamic
-.endif
-
 LIBS.SunOS+=    -lsocket
 
 BUILDLINK_TRANSFORM+=  l:db:db4
diff -r 0e83b099a42a -r 0fbc9fb30fca audio/moc/Makefile
--- a/audio/moc/Makefile        Fri Jul 05 14:51:43 2013 +0000
+++ b/audio/moc/Makefile        Fri Jul 05 15:10:00 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2013/06/16 13:00:59 ryoon Exp $
+# $NetBSD: Makefile,v 1.23 2013/07/05 15:10:00 jperkin Exp $
 
 DISTNAME=              moc-2.4.4
 CATEGORIES=            audio
@@ -35,11 +35,6 @@
 #pre-configure:
 #      cd ${WRKSRC} && autoreconf -v -i
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "SunOS"
-BUILDLINK_TRANSFORM+=  rm:-Wl,--export-dynamic
-.endif
-
 LIBS.SunOS+=   -lsocket
 
 .include "../../audio/libid3tag/buildlink3.mk"
diff -r 0e83b099a42a -r 0fbc9fb30fca cad/gplcver/Makefile
--- a/cad/gplcver/Makefile      Fri Jul 05 14:51:43 2013 +0000
+++ b/cad/gplcver/Makefile      Fri Jul 05 15:10:00 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/10/08 13:25:13 asau Exp $
+# $NetBSD: Makefile,v 1.10 2013/07/05 15:10:00 jperkin Exp $
 #
 
 DISTNAME=              gplcver-2.12a.src
@@ -18,11 +18,6 @@
 
 INSTALLATION_DIRS=     bin lib/gplcver/pli_incs
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "SunOS"
-BUILDLINK_TRANSFORM+=  rm:-export-dynamic
-.endif
-
 .include "../../mk/dlopen.buildlink3.mk"
 
 do-install:
diff -r 0e83b099a42a -r 0fbc9fb30fca chat/pidgin-latex/Makefile
--- a/chat/pidgin-latex/Makefile        Fri Jul 05 14:51:43 2013 +0000
+++ b/chat/pidgin-latex/Makefile        Fri Jul 05 15:10:00 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2013/06/06 12:54:09 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2013/07/05 15:10:00 jperkin Exp $
 
 VERSION=       1.2.1
 PKGREVISION=   30
@@ -30,11 +30,6 @@
 
 DEPENDS+= ImageMagick-[0-9]*:../../graphics/ImageMagick
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "SunOS"
-BUILDLINK_TRANSFORM+=  rm:-Wl,--export-dynamic
-.endif
-
 .include "../../chat/pidgin/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff -r 0e83b099a42a -r 0fbc9fb30fca mk/platform/SunOS.mk
--- a/mk/platform/SunOS.mk      Fri Jul 05 14:51:43 2013 +0000
+++ b/mk/platform/SunOS.mk      Fri Jul 05 15:10:00 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: SunOS.mk,v 1.51 2013/05/16 17:09:07 jperkin Exp $
+# $NetBSD: SunOS.mk,v 1.52 2013/07/05 15:10:00 jperkin Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
@@ -67,6 +67,10 @@
 _OPSYS_WHOLE_ARCHIVE_FLAG=     -z allextract
 _OPSYS_NO_WHOLE_ARCHIVE_FLAG=  -z defaultextract
 
+# Remove flags specific to GNU ld.
+BUILDLINK_TRANSFORM+=  rm:-Wl,--export-dynamic
+BUILDLINK_TRANSFORM+=  rm:-export-dynamic
+
 # Solaris has /usr/include/iconv.h, but it's not GNU iconv, so mark it
 # incompatible.
 _INCOMPAT_ICONV=       SunOS-*-*
diff -r 0e83b099a42a -r 0fbc9fb30fca wm/awesome/Makefile
--- a/wm/awesome/Makefile       Fri Jul 05 14:51:43 2013 +0000
+++ b/wm/awesome/Makefile       Fri Jul 05 15:10:00 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2013/07/05 13:29:43 ryoon Exp $
+# $NetBSD: Makefile,v 1.42 2013/07/05 15:10:00 jperkin Exp $
 #
 
 DISTNAME=      awesome-3.4.13
@@ -47,12 +47,7 @@
 BUILD_DEPENDS+=        xmlto-[0-9]*:../../textproc/xmlto
 BUILD_DEPENDS+=        docbook-xml-[0-9]*:../../textproc/docbook-xml
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-LDFLAGS+=              -liconv
-BUILDLINK_TRANSFORM+=  rm:-export-dynamic
-.endif
+LDFLAGS.SunOS+=                -liconv
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gperf/buildlink3.mk"