diff options
-rw-r--r-- | audio/albumplayer/Makefile | 7 | ||||
-rw-r--r-- | audio/audacious-plugins/Makefile | 3 | ||||
-rw-r--r-- | audio/glurp/Makefile | 7 | ||||
-rw-r--r-- | audio/moc-devel/Makefile | 7 | ||||
-rw-r--r-- | audio/moc/Makefile | 7 | ||||
-rw-r--r-- | cad/gplcver/Makefile | 7 | ||||
-rw-r--r-- | chat/pidgin-latex/Makefile | 7 | ||||
-rw-r--r-- | mk/platform/SunOS.mk | 6 | ||||
-rw-r--r-- | wm/awesome/Makefile | 9 |
9 files changed, 14 insertions, 46 deletions
diff --git a/audio/albumplayer/Makefile b/audio/albumplayer/Makefile index 858b60e91b2..ce8538fc1b3 100644 --- a/audio/albumplayer/Makefile +++ b/audio/albumplayer/Makefile @@ -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 @@ USE_TOOLS+= pkg-config 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 --git a/audio/audacious-plugins/Makefile b/audio/audacious-plugins/Makefile index 979f0806daf..023b20f6050 100644 --- a/audio/audacious-plugins/Makefile +++ b/audio/audacious-plugins/Makefile @@ -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 @@ PLIST.oss= yes .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 --git a/audio/glurp/Makefile b/audio/glurp/Makefile index bc94b1b9b50..1f1be17b554 100644 --- a/audio/glurp/Makefile +++ b/audio/glurp/Makefile @@ -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 @@ USE_TOOLS+= intltool pkg-config 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 --git a/audio/moc-devel/Makefile b/audio/moc-devel/Makefile index 6fa787515f7..24f69faf024 100644 --- a/audio/moc-devel/Makefile +++ b/audio/moc-devel/Makefile @@ -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 @@ SUBST_MESSAGE.oss= Fixing hardcoded audio device. 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 --git a/audio/moc/Makefile b/audio/moc/Makefile index 4c6da79c010..825c7b3ecc2 100644 --- a/audio/moc/Makefile +++ b/audio/moc/Makefile @@ -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 @@ SUBST_MESSAGE.oss= Fixing hardcoded audio device. #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 --git a/cad/gplcver/Makefile b/cad/gplcver/Makefile index 95aae7f8543..732fe253a6a 100644 --- a/cad/gplcver/Makefile +++ b/cad/gplcver/Makefile @@ -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 @@ BUILDLINK_LIBS.dl= ${BUILDLINK_LDADD.dl} 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 --git a/chat/pidgin-latex/Makefile b/chat/pidgin-latex/Makefile index ed41aade428..307bbedda9e 100644 --- a/chat/pidgin-latex/Makefile +++ b/chat/pidgin-latex/Makefile @@ -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 @@ do-install: 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 --git a/mk/platform/SunOS.mk b/mk/platform/SunOS.mk index 6caa3ca2c34..8c753130229 100644 --- a/mk/platform/SunOS.mk +++ b/mk/platform/SunOS.mk @@ -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 @@ _USE_RPATH= yes # add rpath to LDFLAGS _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 --git a/wm/awesome/Makefile b/wm/awesome/Makefile index 2089d88fc37..afa728c847d 100644 --- a/wm/awesome/Makefile +++ b/wm/awesome/Makefile @@ -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+= asciidoc>=8.3.0:../../textproc/asciidoc 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" |