From 27ec8c5d159d35797b9cf2b36d852269d049e3cb Mon Sep 17 00:00:00 2001 From: jperkin Date: Thu, 28 Aug 2014 10:58:18 +0000 Subject: Remove SunOS BUILDLINK_TRANSFORM instances which remove -Wl,--* GNU ld arguments, these are now handled globally by mk/platform/SunOS.mk --- audio/alsa-lib/Makefile | 3 +-- audio/libfishsound/Makefile | 6 +----- devel/libuuid/Makefile | 4 ++-- graphics/shotwell/Makefile | 8 +------- multimedia/liboggz/Makefile | 6 +----- net/host/Makefile | 3 +-- sysutils/hal/Makefile | 4 ++-- sysutils/vcdimager-devel/Makefile | 4 ++-- www/libproxy/Makefile | 5 ++--- x11/qt4-libs/Makefile.common | 3 +-- x11/qt5-qtbase/Makefile.common | 3 +-- 11 files changed, 15 insertions(+), 34 deletions(-) diff --git a/audio/alsa-lib/Makefile b/audio/alsa-lib/Makefile index 3e7f5ed67d7..1ee7343819f 100644 --- a/audio/alsa-lib/Makefile +++ b/audio/alsa-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2014/06/26 20:18:11 asau Exp $ +# $NetBSD: Makefile,v 1.14 2014/08/28 10:58:18 jperkin Exp $ # DISTNAME= alsa-lib-1.0.27.2 @@ -33,7 +33,6 @@ CPPFLAGS.FreeBSD+= -D__u32=uint32_t -D__u64=uint64_t .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "SunOS" CONFIGURE_ARGS+= --without-versioned -BUILDLINK_TRANSFORM+= rm:-Wl,--version-script=Versions .endif .include "../../mk/dlopen.buildlink3.mk" diff --git a/audio/libfishsound/Makefile b/audio/libfishsound/Makefile index 812e6c5f48a..4b0ca229fa3 100644 --- a/audio/libfishsound/Makefile +++ b/audio/libfishsound/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2013/07/07 18:15:55 rodent Exp $ +# $NetBSD: Makefile,v 1.3 2014/08/28 10:58:18 jperkin Exp $ # DISTNAME= libfishsound-1.0.0 @@ -18,10 +18,6 @@ PKGCONFIG_OVERRIDE+= fishsound.pc.in .include "options.mk" -.if ${OPSYS} == "SunOS" -BUILDLINK_TRANSFORM+= rm:-Wl,--version-script=Version_script -.endif - .include "../../multimedia/liboggz/buildlink3.mk" .include "../../multimedia/libogg/buildlink3.mk" .include "../../audio/libsndfile/buildlink3.mk" diff --git a/devel/libuuid/Makefile b/devel/libuuid/Makefile index 5a902f2ffd8..b8d1aecbbbc 100644 --- a/devel/libuuid/Makefile +++ b/devel/libuuid/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2014/07/02 03:45:50 jnemeth Exp $ +# $NetBSD: Makefile,v 1.10 2014/08/28 10:58:18 jperkin Exp $ DISTNAME= util-linux-2.24.2 PKGNAME= ${DISTNAME:S/util-linux/libuuid/} @@ -24,7 +24,7 @@ INSTALLATION_DIRS+= include/uuid lib/pkgconfig ${PKGMANDIR}/man3 .include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "Darwin" || ${OPSYS} == "SunOS" +.if ${OPSYS} == "Darwin" BUILDLINK_TRANSFORM+= rm:-Wl,--version-script=./libuuid/src/uuid.sym .endif diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile index 18344d90e42..794a346b68b 100644 --- a/graphics/shotwell/Makefile +++ b/graphics/shotwell/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2014/08/21 15:35:08 jperkin Exp $ +# $NetBSD: Makefile,v 1.59 2014/08/28 10:58:18 jperkin Exp $ DISTNAME= shotwell-0.11.6 PKGREVISION= 25 @@ -22,12 +22,6 @@ MAKE_ENV+= VALAC=${VALAC} REPLACE_SH+= configure -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -BUILDLINK_TRANSFORM+= rm:-Wl,--no-as-needed -.endif - .include "../../databases/sqlite3/buildlink3.mk" .include "../../devel/GConf/buildlink3.mk" .include "../../devel/glib2/schemas.mk" diff --git a/multimedia/liboggz/Makefile b/multimedia/liboggz/Makefile index 5bd58e32133..6a26752c116 100644 --- a/multimedia/liboggz/Makefile +++ b/multimedia/liboggz/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2013/06/14 11:09:09 rodent Exp $ +# $NetBSD: Makefile,v 1.3 2014/08/28 10:58:18 jperkin Exp $ # DISTNAME= liboggz-1.1.1 @@ -18,9 +18,5 @@ PKGCONFIG_OVERRIDE+= oggz.pc.in .include "options.mk" -.if ${OPSYS} == "SunOS" -BUILDLINK_TRANSFORM+= rm:-Wl,--version-script=Version_script -.endif - .include "../../multimedia/libogg/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/host/Makefile b/net/host/Makefile index 887ee6f6512..857b71515b3 100644 --- a/net/host/Makefile +++ b/net/host/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2013/07/21 12:28:32 shattered Exp $ +# $NetBSD: Makefile,v 1.29 2014/08/28 10:58:18 jperkin Exp $ DISTNAME= host-20070128 CATEGORIES= net @@ -27,7 +27,6 @@ BUILDLINK_TRANSFORM+= rm:-static .endif .if ${OPSYS} == "SunOS" LDFLAGS+= -lresolv -lsocket -lnsl -BUILDLINK_TRANSFORM+= rm:-Wl,--warn-common BUILDLINK_TRANSFORM+= rm:-static .endif .if ${OPSYS} == "Linux" diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile index 6557fabdae4..7ebdc18d75b 100644 --- a/sysutils/hal/Makefile +++ b/sysutils/hal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.69 2014/08/06 12:21:03 obache Exp $ +# $NetBSD: Makefile,v 1.70 2014/08/28 10:58:18 jperkin Exp $ DISTNAME= hal-0.5.14 PKGREVISION= 13 @@ -72,7 +72,7 @@ PLIST_SRC= PLIST CFLAGS.SunOS+= -Du_int32_t=uint32_t -.if ${OPSYS} == "Darwin" || ${OPSYS} == "SunOS" +.if ${OPSYS} == "Darwin" BUILDLINK_TRANSFORM+= rm:-Wl,--as-needed .endif diff --git a/sysutils/vcdimager-devel/Makefile b/sysutils/vcdimager-devel/Makefile index 037fccc6c66..cee8950b936 100644 --- a/sysutils/vcdimager-devel/Makefile +++ b/sysutils/vcdimager-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2013/12/21 11:15:08 jperkin Exp $ +# $NetBSD: Makefile,v 1.44 2014/08/28 10:58:19 jperkin Exp $ # DISTNAME= vcdimager-0.7.24 @@ -20,7 +20,7 @@ PKGCONFIG_OVERRIDE+= libvcdinfo.pc.in .include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin" +.if ${OPSYS} == "Darwin" BUILDLINK_TRANSFORM+= rm:-Wl,--version-script=libvcdinfo.la.ver .endif diff --git a/www/libproxy/Makefile b/www/libproxy/Makefile index a1971af52b2..01dc0cde57a 100644 --- a/www/libproxy/Makefile +++ b/www/libproxy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2014/01/08 09:57:30 jperkin Exp $ +# $NetBSD: Makefile,v 1.22 2014/08/28 10:58:19 jperkin Exp $ DISTNAME= libproxy-0.4.11 CATEGORIES= www gnome @@ -17,10 +17,9 @@ CMAKE_ARGS+= -DWITH_PYTHON:BOOL=OFF .include "../../mk/bsd.fast.prefs.mk" -.if (${OPSYS} == "SunOS") +.if ${OPSYS} == "SunOS" # add libraries needed for Solaris, and add stuff cmake would add it on its own CMAKE_ARGS+= -DCMAKE_EXE_LINKER_FLAGS:STRING="-lnsl -lsocket ${COMPILER_RPATH_FLAG}${PREFIX}/lib" -BUILDLINK_TRANSFORM+= rm:-Wl,--no-as-needed .endif PKGCONFIG_OVERRIDE+= bindings/csharp/libproxy-sharp-1.0.pc.cmake diff --git a/x11/qt4-libs/Makefile.common b/x11/qt4-libs/Makefile.common index 783f0289abd..d4f2807bb92 100644 --- a/x11/qt4-libs/Makefile.common +++ b/x11/qt4-libs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.37 2013/09/02 19:51:32 adam Exp $ +# $NetBSD: Makefile.common,v 1.38 2014/08/28 10:58:19 jperkin Exp $ # used by x11/qt4-docs/Makefile # used by x11/qt4-libs/Makefile # used by x11/qt4-mng/Makefile @@ -80,7 +80,6 @@ CONFIGURE_ARGS+= -platform solaris-cc . endif . endif SYS_LIBS= -lresolv -lsocket -lnsl -lrt -BUILDLINK_TRANSFORM+= rm:-Wl,--gc-sections .elif ${OPSYS} == "Interix" CONFIGURE_ARGS+= -platform interix-g++ CFLAGS+= -I/usr/local/include/bind diff --git a/x11/qt5-qtbase/Makefile.common b/x11/qt5-qtbase/Makefile.common index dcdaa304660..189a1641df1 100644 --- a/x11/qt5-qtbase/Makefile.common +++ b/x11/qt5-qtbase/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.10 2014/04/23 07:05:31 adam Exp $ +# $NetBSD: Makefile.common,v 1.11 2014/08/28 10:58:19 jperkin Exp $ # used by x11/qt5-dbus/Makefile # used by x11/qt5-mysql/Makefile # used by x11/qt5-odbc/Makefile @@ -123,7 +123,6 @@ CONFIGURE_ARGS+= -platform solaris-cc . endif . endif SYS_LIBS= -lresolv -lsocket -lnsl -lrt -BUILDLINK_TRANSFORM+= rm:-Wl,--gc-sections .elif ${OPSYS} == "Interix" CONFIGURE_ARGS+= -platform interix-g++ CFLAGS+= -I/usr/local/include/bind -- cgit v1.2.3