summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2015-04-19 06:42:02 +0000
committerwiz <wiz@pkgsrc.org>2015-04-19 06:42:02 +0000
commit08d205068653f0fa941da51a4921d895a419856e (patch)
tree501a8888b50f3ed2f30433025245da2cd2cd82ca
parent1d422ceae5f646b1a271f8f6123212ec0f121ca7 (diff)
downloadpkgsrc-08d205068653f0fa941da51a4921d895a419856e.tar.gz
Wrap libtool arguments (instead of cxx) and do it for all pulseaudio users
instead of only qt5-qtmultimedia. Fixes build failures in qt5-qtmultimedia users like kid3. Suggested by joerg.
-rw-r--r--audio/pulseaudio/buildlink3.mk4
-rw-r--r--x11/qt5-qtmultimedia/Makefile4
2 files changed, 4 insertions, 4 deletions
diff --git a/audio/pulseaudio/buildlink3.mk b/audio/pulseaudio/buildlink3.mk
index 6f4c5263063..8af578d9d42 100644
--- a/audio/pulseaudio/buildlink3.mk
+++ b/audio/pulseaudio/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.23 2015/02/21 23:13:10 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2015/04/19 06:42:02 wiz Exp $
BUILDLINK_TREE+= pulseaudio
@@ -18,6 +18,8 @@ BUILDLINK_PKGSRCDIR.pulseaudio?= ../../audio/pulseaudio
BUILDLINK_LIBDIRS.pulseaudio+= lib/pulseaudio
BUILDLINK_RPATHDIRS.pulseaudio+= lib/pulseaudio
+_WRAP_EXTRA_ARGS.LIBTOOL+= -L${PREFIX}/lib/pulseaudio
+
pkgbase:= pulseaudio
. include "../../mk/pkg-build-options.mk"
diff --git a/x11/qt5-qtmultimedia/Makefile b/x11/qt5-qtmultimedia/Makefile
index d70341e1c8e..e9b152f2be6 100644
--- a/x11/qt5-qtmultimedia/Makefile
+++ b/x11/qt5-qtmultimedia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2015/04/15 13:13:44 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2015/04/19 06:42:02 wiz Exp $
DISTNAME= qtmultimedia-opensource-src-${QTVERSION}
PKGNAME= qt5-qtmultimedia-${QTVERSION}
@@ -12,8 +12,6 @@ INSTALLATION_DIRS+= lib/pkgconfig
.include "../../x11/qt5-qtbase/Makefile.common"
-_WRAP_EXTRA_ARGS.CXX+= -L${PREFIX}/lib/pulseaudio
-
post-install:
.for i in Qt5Multimedia.pc Qt5MultimediaQuick_p.pc Qt5MultimediaWidgets.pc
cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \