Sat May 20 11:53:10 2023 UTC ()
devel/glib2: Unbreak build on Darwin

Uses DYLD_FALLBACK_LIBRARY_PATH to locate a library used in the
build process but not yet installed

Patch submitted in PR pkg/57415 by jonathan buschmann
ok wiz@


(bacon)
diff -r1.291 -r1.292 pkgsrc/devel/glib2/Makefile
diff -r1.308 -r1.309 pkgsrc/devel/glib2/distinfo
diff -r1.6 -r1.7 pkgsrc/devel/glib2/patches/patch-gio_tests_meson.build
cvs diff -r1.291 -r1.292 pkgsrc/devel/glib2/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/glib2/Makefile 2022/11/23 10:41:41 1.291
+++ pkgsrc/devel/glib2/Makefile 2023/05/20 11:53:10 1.292
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.291 2022/11/23 10:41:41 adam Exp $ 1# $NetBSD: Makefile,v 1.292 2023/05/20 11:53:10 bacon Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4 4
 5PKGREVISION= 1
5CATEGORIES= devel gnome 6CATEGORIES= devel gnome
6COMMENT= Some useful routines for C programming (glib2) 7COMMENT= Some useful routines for C programming (glib2)
7 8
8.include "options.mk" 9.include "options.mk"
9 10
10MESON_ARGS+= -Dinstalled_tests=false 11MESON_ARGS+= -Dinstalled_tests=false
11# Avoid linux dependency on libmount-dev 12# Avoid linux dependency on libmount-dev
12MESON_ARGS+= -Dlibmount=disabled 13MESON_ARGS+= -Dlibmount=disabled
13MESON_ARGS+= -Dlocalstatedir=${VARBASE} 14MESON_ARGS+= -Dlocalstatedir=${VARBASE}
14.if ${OPSYS} == "FreeBSD" 15.if ${OPSYS} == "FreeBSD"
15MESON_ARGS+= -Db_lundef=false 16MESON_ARGS+= -Db_lundef=false
16.endif 17.endif
17 18
cvs diff -r1.308 -r1.309 pkgsrc/devel/glib2/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/glib2/distinfo 2023/05/11 04:43:36 1.308
+++ pkgsrc/devel/glib2/distinfo 2023/05/20 11:53:10 1.309
@@ -1,29 +1,29 @@ @@ -1,29 +1,29 @@
1$NetBSD: distinfo,v 1.308 2023/05/11 04:43:36 schmonz Exp $ 1$NetBSD: distinfo,v 1.309 2023/05/20 11:53:10 bacon Exp $
2 2
3BLAKE2s (glib-2.74.6.tar.xz) = 6f761eeff44efed50a0c0a763564c55f37cde6b37a42bbb464c21f5e620588ef 3BLAKE2s (glib-2.74.6.tar.xz) = 6f761eeff44efed50a0c0a763564c55f37cde6b37a42bbb464c21f5e620588ef
4SHA512 (glib-2.74.6.tar.xz) = 6b6d113012ec90f6cf77513ec0132668c49aa7224c806181ad662388701004667cdf6d263050d6f896b8688c085abf461aa3e659eb288e6ba93ba4970a2f181b 4SHA512 (glib-2.74.6.tar.xz) = 6b6d113012ec90f6cf77513ec0132668c49aa7224c806181ad662388701004667cdf6d263050d6f896b8688c085abf461aa3e659eb288e6ba93ba4970a2f181b
5Size (glib-2.74.6.tar.xz) = 5217312 bytes 5Size (glib-2.74.6.tar.xz) = 5217312 bytes
6SHA1 (patch-gio_gcredentialsprivate.h) = f719ae41a9eb1d2f04d866b246fa5176543f2df9 6SHA1 (patch-gio_gcredentialsprivate.h) = f719ae41a9eb1d2f04d866b246fa5176543f2df9
7SHA1 (patch-gio_gdbus-2.0_codegen_meson.build) = 76ed9658ac11fb33b97143938b6a60b5aa515cae 7SHA1 (patch-gio_gdbus-2.0_codegen_meson.build) = 76ed9658ac11fb33b97143938b6a60b5aa515cae
8SHA1 (patch-gio_giomodule.c) = 68e612ac178c41aa0aae2bd66c3e4263910711ac 8SHA1 (patch-gio_giomodule.c) = 68e612ac178c41aa0aae2bd66c3e4263910711ac
9SHA1 (patch-gio_glib-compile-schemas.c) = 4fc8e8ba62bef01762007ebf21569053374808d0 9SHA1 (patch-gio_glib-compile-schemas.c) = 4fc8e8ba62bef01762007ebf21569053374808d0
10SHA1 (patch-gio_gresource-tool.c) = ad0e59f48f5f98ea66be568dbe2e5a5d1ac602fc 10SHA1 (patch-gio_gresource-tool.c) = ad0e59f48f5f98ea66be568dbe2e5a5d1ac602fc
11SHA1 (patch-gio_gunixcredentialsmessage.c) = c13119ddd6262db7c03e53857e987f0c495d3312 11SHA1 (patch-gio_gunixcredentialsmessage.c) = c13119ddd6262db7c03e53857e987f0c495d3312
12SHA1 (patch-gio_gunixmounts.c) = 48b6945fde5b1721ca246eb7e79f73b5b480e816 12SHA1 (patch-gio_gunixmounts.c) = 48b6945fde5b1721ca246eb7e79f73b5b480e816
13SHA1 (patch-gio_inotify_inotify-kernel.c) = 78544b4c32ef3b44e8721b1c07407f46a9e8c8a4 13SHA1 (patch-gio_inotify_inotify-kernel.c) = 78544b4c32ef3b44e8721b1c07407f46a9e8c8a4
14SHA1 (patch-gio_meson.build) = c2900405ed83fa84d5590b83c7bcf6f994694388 14SHA1 (patch-gio_meson.build) = c2900405ed83fa84d5590b83c7bcf6f994694388
15SHA1 (patch-gio_tests_gdbus-export.c) = 59d85ca079d02b52e33153c7d2ac1cc48c26707a 15SHA1 (patch-gio_tests_gdbus-export.c) = 59d85ca079d02b52e33153c7d2ac1cc48c26707a
16SHA1 (patch-gio_tests_meson.build) = 88dad0c56d7d5a4915b20745a7d582039163d852 16SHA1 (patch-gio_tests_meson.build) = 6e02b4b16b7e668e91b6d308b70c3e5492aef038
17SHA1 (patch-glib_gatomic.c) = deb2e74010523ad41ce141aa2f49b807ba2672e6 17SHA1 (patch-glib_gatomic.c) = deb2e74010523ad41ce141aa2f49b807ba2672e6
18SHA1 (patch-glib_gatomic.h) = d1c39c3594a5c89d196349e5eafb5512795f55f8 18SHA1 (patch-glib_gatomic.h) = d1c39c3594a5c89d196349e5eafb5512795f55f8
19SHA1 (patch-glib_genviron.c) = dd25be36536d56dfe933225d785eb65f753c4a97 19SHA1 (patch-glib_genviron.c) = dd25be36536d56dfe933225d785eb65f753c4a97
20SHA1 (patch-glib_gspawn.c) = 8f833edd594168fe62c5d0e161ebaafdebda2294 20SHA1 (patch-glib_gspawn.c) = 8f833edd594168fe62c5d0e161ebaafdebda2294
21SHA1 (patch-glib_meson.build) = f1685d64dea7939e1b112c362fc05e849c870711 21SHA1 (patch-glib_meson.build) = f1685d64dea7939e1b112c362fc05e849c870711
22SHA1 (patch-glib_tests_hash.c) = a7e19ca55fcbbc0b188c34755cae5b6b65b67f1a 22SHA1 (patch-glib_tests_hash.c) = a7e19ca55fcbbc0b188c34755cae5b6b65b67f1a
23SHA1 (patch-glib_tests_include.c) = 12d98caebfb87c1146821d518c37c45f97fc7be0 23SHA1 (patch-glib_tests_include.c) = 12d98caebfb87c1146821d518c37c45f97fc7be0
24SHA1 (patch-glib_tests_meson.build) = 6af78a11f13f3c765ed0d9a9aad88daa7c124752 24SHA1 (patch-glib_tests_meson.build) = 6af78a11f13f3c765ed0d9a9aad88daa7c124752
25SHA1 (patch-gmodule_gmodule-dl.c) = 13a6e81adc1b54ab0ed8d6302ee063754cd6f881 25SHA1 (patch-gmodule_gmodule-dl.c) = 13a6e81adc1b54ab0ed8d6302ee063754cd6f881
26SHA1 (patch-gmodule_gmodule.c) = a020920b8e5bad34550c9963eb2fc27bef24c5c9 26SHA1 (patch-gmodule_gmodule.c) = a020920b8e5bad34550c9963eb2fc27bef24c5c9
27SHA1 (patch-gobject_glib-mkenums.in) = c177cf9b1ea81542665240678f47f68351a3760d 27SHA1 (patch-gobject_glib-mkenums.in) = c177cf9b1ea81542665240678f47f68351a3760d
28SHA1 (patch-gobject_meson.build) = a3953d33ba7e906ff1df024221ac3ab32f6c0c66 28SHA1 (patch-gobject_meson.build) = a3953d33ba7e906ff1df024221ac3ab32f6c0c66
29SHA1 (patch-meson.build) = 18fb6ac870718e9950cb2f1a20ad23b6b6475463 29SHA1 (patch-meson.build) = 18fb6ac870718e9950cb2f1a20ad23b6b6475463
cvs diff -r1.6 -r1.7 pkgsrc/devel/glib2/patches/patch-gio_tests_meson.build (expand / switch to unified diff)

--- pkgsrc/devel/glib2/patches/patch-gio_tests_meson.build 2023/05/11 04:43:36 1.6
+++ pkgsrc/devel/glib2/patches/patch-gio_tests_meson.build 2023/05/20 11:53:10 1.7
@@ -1,62 +1,83 @@ @@ -1,62 +1,83 @@
1$NetBSD: patch-gio_tests_meson.build,v 1.6 2023/05/11 04:43:36 schmonz Exp $ 1$NetBSD: patch-gio_tests_meson.build,v 1.7 2023/05/20 11:53:10 bacon Exp $
2 2
3Work around PR pkg/57399. 3Work around PR pkg/57399. + DYLD_LIBRARY_PATH for macOS
4 4
5--- gio/tests/meson.build.orig 2023-02-23 13:54:27.000000000 +0000 5--- gio/tests/meson.build 2023-02-23 21:54:27.000000000 +0800
6+++ gio/tests/meson.build 6+++ gio/tests/meson.build 2023-05-16 13:37:44.000000000 +0800
7@@ -662,6 +662,7 @@ if meson.can_run_host_binaries() 7@@ -662,6 +662,10 @@
8 plugin_resources_c = custom_target('plugin-resources.c', 8 plugin_resources_c = custom_target('plugin-resources.c',
9 input : 'test4.gresource.xml', 9 input : 'test4.gresource.xml',
10 output : 'plugin-resources.c', 10 output : 'plugin-resources.c',
11+ env : {'LC_ALL': 'en_US.UTF-8'}, 11+ env : {
 12+ 'LC_ALL': 'en_US.UTF-8',
 13+ 'DYLD_FALLBACK_LIBRARY_PATH': '@0@/glib:@0@/gio:@0@/gobject:@0@/gmodule'.replace('@0@', meson.project_build_root())
 14+ },
12 command : [glib_compile_resources, 15 command : [glib_compile_resources,
13 compiler_type, 16 compiler_type,
14 '--target=@OUTPUT@', 17 '--target=@OUTPUT@',
15@@ -690,6 +691,7 @@ if meson.can_run_host_binaries() 18@@ -690,6 +694,10 @@
16 test_gresource = custom_target('test.gresource', 19 test_gresource = custom_target('test.gresource',
17 input : 'test.gresource.xml', 20 input : 'test.gresource.xml',
18 output : 'test.gresource', 21 output : 'test.gresource',
19+ env : {'LC_ALL': 'en_US.UTF-8'}, 22+ env : {
 23+ 'LC_ALL': 'en_US.UTF-8',
 24+ 'DYLD_FALLBACK_LIBRARY_PATH': '@0@/glib:@0@/gio:@0@/gobject:@0@/gmodule'.replace('@0@', meson.project_build_root())
 25+ },
20 command : [glib_compile_resources, 26 command : [glib_compile_resources,
21 compiler_type, 27 compiler_type,
22 '--target=@OUTPUT@', 28 '--target=@OUTPUT@',
23@@ -704,6 +706,7 @@ if meson.can_run_host_binaries() 29@@ -704,6 +712,10 @@
24 test_resources2_c = custom_target('test_resources2.c', 30 test_resources2_c = custom_target('test_resources2.c',
25 input : 'test3.gresource.xml', 31 input : 'test3.gresource.xml',
26 output : 'test_resources2.c', 32 output : 'test_resources2.c',
27+ env : {'LC_ALL': 'en_US.UTF-8'}, 33+ env : {
 34+ 'LC_ALL': 'en_US.UTF-8',
 35+ 'DYLD_FALLBACK_LIBRARY_PATH': '@0@/glib:@0@/gio:@0@/gobject:@0@/gmodule'.replace('@0@', meson.project_build_root())
 36+ },
28 command : [glib_compile_resources, 37 command : [glib_compile_resources,
29 compiler_type, 38 compiler_type,
30 '--target=@OUTPUT@', 39 '--target=@OUTPUT@',
31@@ -717,6 +720,7 @@ if meson.can_run_host_binaries() 40@@ -717,6 +729,10 @@
32 test_resources2_h = custom_target('test_resources2.h', 41 test_resources2_h = custom_target('test_resources2.h',
33 input : 'test3.gresource.xml', 42 input : 'test3.gresource.xml',
34 output : 'test_resources2.h', 43 output : 'test_resources2.h',
35+ env : {'LC_ALL': 'en_US.UTF-8'}, 44+ env : {
 45+ 'LC_ALL': 'en_US.UTF-8',
 46+ 'DYLD_FALLBACK_LIBRARY_PATH': '@0@/glib:@0@/gio:@0@/gobject:@0@/gmodule'.replace('@0@', meson.project_build_root())
 47+ },
36 command : [glib_compile_resources, 48 command : [glib_compile_resources,
37 compiler_type, 49 compiler_type,
38 '--target=@OUTPUT@', 50 '--target=@OUTPUT@',
39@@ -731,6 +735,7 @@ if meson.can_run_host_binaries() 51@@ -731,6 +747,10 @@
40 input : 'test2.gresource.xml', 52 input : 'test2.gresource.xml',
41 depends : big_test_resource, 53 depends : big_test_resource,
42 output : 'test_resources.c', 54 output : 'test_resources.c',
43+ env : {'LC_ALL': 'en_US.UTF-8'}, 55+ env : {
 56+ 'LC_ALL': 'en_US.UTF-8',
 57+ 'DYLD_FALLBACK_LIBRARY_PATH': '@0@/glib:@0@/gio:@0@/gobject:@0@/gmodule'.replace('@0@', meson.project_build_root())
 58+ },
44 command : [glib_compile_resources, 59 command : [glib_compile_resources,
45 compiler_type, 60 compiler_type,
46 '--target=@OUTPUT@', 61 '--target=@OUTPUT@',
47@@ -744,6 +749,7 @@ if meson.can_run_host_binaries() 62@@ -744,6 +764,10 @@
48 digit_test_resources_c = custom_target('digit_test_resources.c', 63 digit_test_resources_c = custom_target('digit_test_resources.c',
49 input : '111_digit_test.gresource.xml', 64 input : '111_digit_test.gresource.xml',
50 output : 'digit_test_resources.c', 65 output : 'digit_test_resources.c',
51+ env : {'LC_ALL': 'en_US.UTF-8'}, 66+ env : {
 67+ 'LC_ALL': 'en_US.UTF-8',
 68+ 'DYLD_FALLBACK_LIBRARY_PATH': '@0@/glib:@0@/gio:@0@/gobject:@0@/gmodule'.replace('@0@', meson.project_build_root())
 69+ },
52 command : [glib_compile_resources, 70 command : [glib_compile_resources,
53 compiler_type, 71 compiler_type,
54 '--target=@OUTPUT@', 72 '--target=@OUTPUT@',
55@@ -757,6 +763,7 @@ if meson.can_run_host_binaries() 73@@ -757,6 +781,10 @@
56 digit_test_resources_h = custom_target('digit_test_resources.h', 74 digit_test_resources_h = custom_target('digit_test_resources.h',
57 input : '111_digit_test.gresource.xml', 75 input : '111_digit_test.gresource.xml',
58 output : 'digit_test_resources.h', 76 output : 'digit_test_resources.h',
59+ env : {'LC_ALL': 'en_US.UTF-8'}, 77+ env : {
 78+ 'LC_ALL': 'en_US.UTF-8',
 79+ 'DYLD_FALLBACK_LIBRARY_PATH': '@0@/glib:@0@/gio:@0@/gobject:@0@/gmodule'.replace('@0@', meson.project_build_root())
 80+ },
60 command : [glib_compile_resources, 81 command : [glib_compile_resources,
61 compiler_type, 82 compiler_type,
62 '--target=@OUTPUT@', 83 '--target=@OUTPUT@',