pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/devel/libwnck3 libwnck3: Clean up. Fix tools / pkgconf...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6cdaa118af98
branches:  trunk
changeset: 441998:6cdaa118af98
user:      nia <nia%pkgsrc.org@localhost>
date:      Mon Nov 16 12:32:52 2020 +0000

description:
libwnck3: Clean up. Fix tools / pkgconfig file.

Attempt to fix build on SunOS/Darwin by stripping GNU linker arguments.

This package was converted to meson incorrectly, see:
http://wiki.netbsd.org/pkgsrc/how_to_convert_autotools_to_meson/

diffstat:

 devel/libwnck3/Makefile |  20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diffs (38 lines):

diff -r 828332acf5a5 -r 6cdaa118af98 devel/libwnck3/Makefile
--- a/devel/libwnck3/Makefile   Mon Nov 16 12:17:58 2020 +0000
+++ b/devel/libwnck3/Makefile   Mon Nov 16 12:32:52 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2020/10/01 11:58:16 prlw1 Exp $
+# $NetBSD: Makefile,v 1.32 2020/11/16 12:32:52 nia Exp $
 
 DISTNAME=      libwnck-3.36.0
 PKGNAME=       ${DISTNAME:S/libwnck/libwnck3/}
@@ -11,17 +11,21 @@
 COMMENT=       Library to write pagers and tasklists
 LICENSE=       gnu-lgpl-v2
 
-#GNU_CONFIGURE=                yes
-#USE_PKGLOCALEDIR=     yes
-#USE_TOOLS+=           gmake msgfmt pkg-config
-USE_TOOLS+=            pkg-config
-#USE_LIBTOOL=          yes
-
-PKGCONFIG_OVERRIDE=    libwnck-3.0.pc.in
+USE_TOOLS+=    pkg-config xgettext
 
 # wnckutils conflict with devel/libwnck, but also probably aren't used
 MESON_ARGS+=   -Dinstall_tools=false
 
+# Remove unsupported linker arguments.
+# Apply removals to post-wrapper transformed arguments.
+BUILDLINK_TRANSFORM.Darwin+=   rm:-Wl,--version-script
+BUILDLINK_TRANSFORM.Darwin+=   rm:-Wl,${WRKSRC}/libwnck/libwnck-3.map
+BUILDLINK_TRANSFORM.SunOS+=    rm:-Wl,--version-script
+BUILDLINK_TRANSFORM.SunOS+=    rm:-Wl,${WRKSRC}/libwnck/libwnck-3.map
+
+PKGCONFIG_OVERRIDE_STAGE=      pre-install
+PKGCONFIG_OVERRIDE=            output/libwnck-3.0.pc
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/gobject-introspection/buildlink3.mk"



Home | Main Index | Thread Index | Old Index