[sparc64/base-gcc] Fix build of graphics/colord-gtk

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[sparc64/base-gcc] Fix build of graphics/colord-gtk

Kurt Mosiejczuk-9
Adding -L${X11BASE}/lib to CFLAGS fixes the build on sparc64 (And presumably
other base-gcc architectures).

No revision bump since it hasn't built on sparc64 and shouldn't make
a difference to non-sparc64.

ok?

(cc maintainer)

--Kurt

Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/colord-gtk/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile 10 Jul 2019 21:01:27 -0000 1.22
+++ Makefile 25 Mar 2020 02:32:47 -0000
@@ -38,4 +38,6 @@ CONFIGURE_ARGS= -Ddocs=false \
 # XXX require docbook-xsl-nsl
 CONFIGURE_ARGS += -Dman=false
 
+CFLAGS += -L${X11BASE}/lib
+
 .include <bsd.port.mk>

Reply | Threaded
Open this post in threaded view
|

Re: [sparc64/base-gcc] Fix build of graphics/colord-gtk

Jeremie Courreges-Anglas-2
On Tue, Mar 24 2020, Kurt Mosiejczuk <[hidden email]> wrote:

> Adding -L${X11BASE}/lib to CFLAGS fixes the build on sparc64 (And presumably
> other base-gcc architectures).
>
> No revision bump since it hasn't built on sparc64 and shouldn't make
> a difference to non-sparc64.
>
> ok?
>
> (cc maintainer)
>
> --Kurt
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/graphics/colord-gtk/Makefile,v
> retrieving revision 1.22
> diff -u -p -r1.22 Makefile
> --- Makefile 10 Jul 2019 21:01:27 -0000 1.22
> +++ Makefile 25 Mar 2020 02:32:47 -0000
> @@ -38,4 +38,6 @@ CONFIGURE_ARGS= -Ddocs=false \
>  # XXX require docbook-xsl-nsl
>  CONFIGURE_ARGS += -Dman=false
>  
> +CFLAGS += -L${X11BASE}/lib
> +
>  .include <bsd.port.mk>

Looks like you're using CFLAGS because setting LDFLAGS doesn't work.
The diff below also fixed colord-gtk on sparc64, using LDFLAGS (also it
restricts the tweak to ld.bfd archs).

I'm not sure why meson.port.mk doesn't also export LDFLAGS in
MODMESON_CONFIGURE_ENV.  Maybe because gnome.port.mk somehow needs to
own it?

Antoine, thoughts?


Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/colord-gtk/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile 10 Jul 2019 21:01:27 -0000 1.22
+++ Makefile 26 Mar 2020 01:25:40 -0000
@@ -37,5 +37,11 @@ CONFIGURE_ARGS= -Ddocs=false \
 
 # XXX require docbook-xsl-nsl
 CONFIGURE_ARGS += -Dman=false
+CONFIGURE_ENV = LDFLAGS="${LDFLAGS}"
+
+.include <bsd.port.arch.mk>
+.if !${PROPERTIES:Mlld}
+LDFLAGS += -L${X11BASE}/lib
+.endif
 
 .include <bsd.port.mk>

--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE