tech-pkg archive

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

Re: MacOS issues with devel/glibc2, devel/gobject-introspection, devel/pango



> On Feb 18, 2020, at 7:37 AM, Jonathan Perkin <jperkin%joyent.com@localhost> wrote:
> 
> I didn't need to modify tools/meson.build.  Did you try just doing the
> steps I outlined and then build from clean?  I'd be surprised if it
> works for me (when it previously didn't) but doesn't for you.
> 
> Also to clarify this is against pkgsrc trunk, not 2019Q4.

Sorry, I misunderstood what you were suggesting.  I also have no idea what you mean by "compile in the realpath of the pkgsrc checkout”.  Isn’t that what meson.current_build_dir() does?

For me on both 2019Q4 and HEAD, it was enough to do the following:

- remove patch-giscanner_ccompiler.py

- apply your patch to gir/meson.build (I split your single new line into two for readability, but that should make no difference; see below).

Thanks for the fix.  Shall we commit it?

Cheers,
Brook



$NetBSD$

--- gir/meson.build.orig	2019-09-09 19:22:10.000000000 +0000
+++ gir/meson.build
@@ -433,7 +433,8 @@ foreach gir : gir_files
     input: gir,
     output: '@BASENAME@.typelib',
     depends: [gobject_gir, ],
-    command: [gircompiler, '-o', '@OUTPUT@', '@INPUT@',
+    command: ['env', 'LD_LIBRARY_PATH=' + meson.current_build_dir() + '/../girepository',
+    	      gircompiler, '-o', '@OUTPUT@', '@INPUT@',
               '--includedir', meson.current_build_dir(),
               '--includedir', meson.current_source_dir(),
     ],




Home | Main Index | Thread Index | Old Index