[sparc64/base-gcc/ld.bfd] Fix build of x11/libhandy

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

[sparc64/base-gcc/ld.bfd] Fix build of x11/libhandy

Kurt Mosiejczuk-9
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)

--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 25 Mar 2020 03:12:09 -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
@@ -25,6 +28,8 @@ BUILD_DEPENDS = ${RUN_DEPENDS}
 RUN_DEPENDS = devel/gobject-introspection \
  lang/vala
 LIB_DEPENDS = x11/gtk+3
+
+CFLAGS += -L${X11BASE}/lib
 
 CONFIGURE_ARGS += -Dglade_catalog=disabled \
  -Dexamples=false

Reply | Threaded
Open this post in threaded view
|

Re: [sparc64/base-gcc/ld.bfd] Fix build of x11/libhandy

Jeremie Courreges-Anglas-2
On Tue, Mar 24 2020, Kurt Mosiejczuk <[hidden email]> 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.

> --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 25 Mar 2020 03:12:09 -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
> @@ -25,6 +28,8 @@ BUILD_DEPENDS = ${RUN_DEPENDS}
>  RUN_DEPENDS = devel/gobject-introspection \
>   lang/vala
>  LIB_DEPENDS = x11/gtk+3
> +
> +CFLAGS += -L${X11BASE}/lib
>  
>  CONFIGURE_ARGS += -Dglade_catalog=disabled \
>   -Dexamples=false
>


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

Reply | Threaded
Open this post in threaded view
|

Re: [sparc64/base-gcc/ld.bfd] Fix build of x11/libhandy

Kurt Mosiejczuk-9
On Thu, Mar 26, 2020 at 03:10:04AM +0100, Jeremie Courreges-Anglas wrote:
> On Tue, Mar 24 2020, Kurt Mosiejczuk <[hidden email]> 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