CVS commit: pkgsrc/devel/gobject-introspection

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun Oct 31 23:05:48 UTC 2021

Modified Files:
        pkgsrc/devel/gobject-introspection: distinfo
        pkgsrc/devel/gobject-introspection/patches: patch-gir_meson.build
Added Files:
        pkgsrc/devel/gobject-introspection/patches: patch-tests_meson.build
            patch-tests_offsets_meson.build patch-tests_scanner_meson.build

Log Message:
gobject-introspection: really fix macOS build

The workaround from patch-gir_meson.build needs to be applied also
in the test suite in order to find yet-to-be installed libraries.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 pkgsrc/devel/gobject-introspection/distinfo
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/devel/gobject-introspection/patches/patch-gir_meson.build
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/gobject-introspection/patches/patch-tests_meson.build \
    pkgsrc/devel/gobject-introspection/patches/patch-tests_offsets_meson.build \
    pkgsrc/devel/gobject-introspection/patches/patch-tests_scanner_meson.build

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/gobject-introspection/distinfo
diff -u pkgsrc/devel/gobject-introspection/distinfo:1.45 pkgsrc/devel/gobject-introspection/distinfo:1.46
--- pkgsrc/devel/gobject-introspection/distinfo:1.45    Sun Oct 31 22:39:37 2021
+++ pkgsrc/devel/gobject-introspection/distinfo Sun Oct 31 23:05:47 2021
@@ -1,12 +1,15 @@
-$NetBSD: distinfo,v 1.45 2021/10/31 22:39:37 tnn Exp $
+$NetBSD: distinfo,v 1.46 2021/10/31 23:05:47 tnn Exp $
 
 BLAKE2s (gobject-introspection-1.68.0.tar.xz) = f702638b2a8ddf0e3f692a11e112a437128da0f89b6c40efa3b3acf07ef79fd6
 SHA512 (gobject-introspection-1.68.0.tar.xz) = d2e64c119aa500b624a57baa2cebe9126ab100003d98b771f4fb51cf92748635de352997f702f40656f7c665f3dfedfbfa19912cc7a2d039d254555243bbc381
 Size (gobject-introspection-1.68.0.tar.xz) = 1019732 bytes
-SHA1 (patch-gir_meson.build) = 428739a91aad88fcc003f0e3aaca68f1f8631a91
+SHA1 (patch-gir_meson.build) = 787c0372b3c0679b91e711f22a936d6134793561
 SHA1 (patch-giscanner_ast.py) = 06b3d8903d126028d2d5144c6d6a508209c834b9
 SHA1 (patch-giscanner_ccompiler.py) = f65622421968e9daef19bafc4bd3c3d210546389
+SHA1 (patch-tests_meson.build) = 7d7b090c81624a7a09d0d4afc68fc47b47aa7b90
+SHA1 (patch-tests_offsets_meson.build) = 13f91c775e7658136b1c31c472cf7407039cb905
 SHA1 (patch-tests_scanner_Regress-1.0-expected.gir) = f6f044a24045d38d78b9c511813be8442ce45b16
+SHA1 (patch-tests_scanner_meson.build) = 32209234d1c7c7499a336f3c313e9e943bc6576b
 SHA1 (patch-tools_compiler.c) = 799d5a086338e08378b8b249e6808e8b1a8101dc
 SHA1 (patch-tools_generate.c) = 3fa74dd0e2c7658768a4278b984be38bff729d94
 SHA1 (patch-tools_meson.build) = 01c9aaaaacf1d0855704f55eb568b77bc207cc14

Index: pkgsrc/devel/gobject-introspection/patches/patch-gir_meson.build
diff -u pkgsrc/devel/gobject-introspection/patches/patch-gir_meson.build:1.4 pkgsrc/devel/gobject-introspection/patches/patch-gir_meson.build:1.5
--- pkgsrc/devel/gobject-introspection/patches/patch-gir_meson.build:1.4        Sun Oct 31 22:39:38 2021
+++ pkgsrc/devel/gobject-introspection/patches/patch-gir_meson.build    Sun Oct 31 23:05:47 2021
@@ -1,15 +1,19 @@
-$NetBSD: patch-gir_meson.build,v 1.4 2021/10/31 22:39:38 tnn Exp $
+$NetBSD: patch-gir_meson.build,v 1.5 2021/10/31 23:05:47 tnn Exp $
 
 gircompiler requires libraries from the build area.
 
---- gir/meson.build.orig       2020-03-07 14:13:21.645308500 +0000
+--- gir/meson.build.orig       2021-03-19 14:22:12.050101500 +0000
 +++ gir/meson.build
-@@ -446,7 +446,7 @@ typelibs = []
+@@ -436,7 +436,11 @@ typelibs = []
  if get_option('gi_cross_binary_wrapper') != ''
      gircompiler_command = [get_option('gi_cross_binary_wrapper'), gircompiler.full_path(), ]
  else
 -    gircompiler_command = [gircompiler, ]
-+    gircompiler_command = ['env', 'LD_LIBRARY_PATH=' + meson.current_build_dir() + '/../girepository', gircompiler ]
++    gircompiler_command = ['env',
++        'LD_LIBRARY_PATH=' + meson.current_build_dir() + '/../girepository',
++        'DYLD_LIBRARY_PATH=' + meson.current_build_dir() + '/../girepository',
++        gircompiler
++    ]
  endif
  
  gircompiler_command += [ '-o', '@OUTPUT@', '@INPUT@',

Added files:

Index: pkgsrc/devel/gobject-introspection/patches/patch-tests_meson.build
diff -u /dev/null pkgsrc/devel/gobject-introspection/patches/patch-tests_meson.build:1.1
--- /dev/null   Sun Oct 31 23:05:48 2021
+++ pkgsrc/devel/gobject-introspection/patches/patch-tests_meson.build  Sun Oct 31 23:05:47 2021
@@ -0,0 +1,18 @@
+$NetBSD: patch-tests_meson.build,v 1.1 2021/10/31 23:05:47 tnn Exp $
+
+gircompiler requires libraries from the build area.
+
+--- tests/meson.build.orig     2021-03-19 14:22:12.000000000 +0000
++++ tests/meson.build
+@@ -162,7 +162,10 @@ if glib_dep.type_name() == 'pkgconfig'
+       input: gir,
+       output: '@BASENAME@.typelib',
+       depends: [gobject_gir, ],
+-      command: [gircompiler, '-o', '@OUTPUT@', '@INPUT@',
++      command: ['env',
++               'LD_LIBRARY_PATH=' + meson.current_build_dir() + '/../girepository',
++               'DYLD_LIBRARY_PATH=' + meson.current_build_dir() + '/../girepository',
++                gircompiler, '-o', '@OUTPUT@', '@INPUT@',
+                 '--includedir', join_paths(build_root, 'gir'),
+                 '--includedir', meson.current_build_dir()
+       ],
Index: pkgsrc/devel/gobject-introspection/patches/patch-tests_offsets_meson.build
diff -u /dev/null pkgsrc/devel/gobject-introspection/patches/patch-tests_offsets_meson.build:1.1
--- /dev/null   Sun Oct 31 23:05:48 2021
+++ pkgsrc/devel/gobject-introspection/patches/patch-tests_offsets_meson.build  Sun Oct 31 23:05:47 2021
@@ -0,0 +1,18 @@
+$NetBSD: patch-tests_offsets_meson.build,v 1.1 2021/10/31 23:05:47 tnn Exp $
+
+gircompiler requires libraries from the build area.
+
+--- tests/offsets/meson.build.orig     2021-03-19 14:22:12.000000000 +0000
++++ tests/offsets/meson.build
+@@ -45,7 +45,10 @@ if glib_dep.type_name() == 'pkgconfig'
+     input: test_offsets_gir,
+     output: '@BASENAME@.typelib',
+     depends: [gobject_gir, ],
+-    command: [gircompiler, '-o', '@OUTPUT@', '@INPUT@',
++    command: ['env',
++              'LD_LIBRARY_PATH=' + meson.current_build_dir() + '/../../girepository',
++              'DYLD_LIBRARY_PATH=' + meson.current_build_dir() + '/../../girepository',
++              gircompiler, '-o', '@OUTPUT@', '@INPUT@',
+               '--includedir', join_paths(meson.build_root(), 'gir'),
+               '--includedir', meson.current_build_dir()
+     ],
Index: pkgsrc/devel/gobject-introspection/patches/patch-tests_scanner_meson.build
diff -u /dev/null pkgsrc/devel/gobject-introspection/patches/patch-tests_scanner_meson.build:1.1
--- /dev/null   Sun Oct 31 23:05:48 2021
+++ pkgsrc/devel/gobject-introspection/patches/patch-tests_scanner_meson.build  Sun Oct 31 23:05:47 2021
@@ -0,0 +1,16 @@
+$NetBSD: patch-tests_scanner_meson.build,v 1.1 2021/10/31 23:05:47 tnn Exp $
+
+gircompiler requires libraries from the build area.
+
+--- tests/scanner/meson.build.orig     2021-03-19 14:22:12.000000000 +0000
++++ tests/scanner/meson.build
+@@ -105,6 +105,9 @@ regress_lib = shared_library('regress-1.
+ python_path = run_command(python, ['-c', 'import sys; sys.stdout.write(sys.executable)']).stdout()
+ 
+ gircompiler_command = [
++  'env',
++  'LD_LIBRARY_PATH=' + meson.current_build_dir() + '/../../girepository',
++  'DYLD_LIBRARY_PATH=' + meson.current_build_dir() + '/../../girepository',
+   gircompiler, '-o', '@OUTPUT@', '@INPUT@',
+   '--includedir', join_paths(build_root, 'gir'),
+   '--includedir', meson.current_build_dir(),