On Thu, Mar 26, 2020 at 03:10:04AM +0100, Jeremie Courreges-Anglas wrote:
> On Tue, Mar 24 2020, Kurt Mosiejczuk <[email protected]> wrote:
> > x11/libhandy needs ports-gcc on base-gcc architectures and needs
> > -L${X11BASE}/lib added to CFLAGS to build properly on base-gcc
> > architectures.
> > No REVISION bump since it hasn't built on those other architectures
> > before.
> > (cc maintainer)
> Just like for colord-gtk, I suspect it would be cleaner to use LDFLAGS
> for this kind of tweak, but that requires adding LDFLAGS to
> CONFIGURE_ENV (meson.port.mk doesn't do it).
> Also cc'ing Antoine who maintains colord-gtk, it would be good to
> discuss this in a single email thread.
Here's a version of the libhandy diff that uses LDFLAGS like in
your diff for colord-gtk
--Kurt
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/libhandy/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile 2 Nov 2019 11:12:35 -0000 1.4
+++ Makefile 26 Mar 2020 14:25:26 -0000
@@ -16,6 +16,9 @@ MAINTAINER = Jasper Lievisse Adriaanse
# LGPLv2.1
PERMIT_PACKAGE = Yes
+COMPILER = base-clang ports-gcc
+COMPILER_LANGS = c
+
MODULES = devel/meson
WANTLIB += atk-1.0 cairo gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
@@ -26,8 +29,15 @@ RUN_DEPENDS = devel/gobject-introspecti
lang/vala
LIB_DEPENDS = x11/gtk+3
+
CONFIGURE_ARGS += -Dglade_catalog=disabled \
-Dexamples=false
+CONFIGURE_ENV = LDFLAGS=${LDFLAGS}
+
+.include <bsd.port.arch.mk>
+.if !${PROPERTIES:Mlld}
+LDFLAGS = -L${X11BASE}/lib
+.endif
TEST_IS_INTERACTIVE = X11
