Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 9544084EC8 for ; Tue, 22 Aug 2023 14:09:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id K97oGAxOjSVP for ; Tue, 22 Aug 2023 14:09:37 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id C605384D2E for ; Tue, 22 Aug 2023 14:09:37 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id B9CFCFBDB; Tue, 22 Aug 2023 14:09:37 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_169271337756970" MIME-Version: 1.0 Date: Tue, 22 Aug 2023 14:09:37 +0000 From: "Amitai Schleier" Subject: CVS commit: pkgsrc/devel/glib2 To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: schmonz@netbsd.org X-Mailer: log_accum Message-Id: <20230822140937.B9CFCFBDB@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_169271337756970 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: schmonz Date: Tue Aug 22 14:09:37 UTC 2023 Modified Files: pkgsrc/devel/glib2: distinfo pkgsrc/devel/glib2/patches: patch-gio_tests_meson.build Log Message: glib2: fix update builds on macOS. Use DYLD_LIBRARY_PATH (searched first) instead of DYLD_FALLBACK_LIBRARY_PATH (searched last) to find newly built libraries even if an earlier version is already installed. To generate a diff of this commit: cvs rdiff -u -r1.312 -r1.313 pkgsrc/devel/glib2/distinfo cvs rdiff -u -r1.7 -r1.8 \ pkgsrc/devel/glib2/patches/patch-gio_tests_meson.build Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_169271337756970 Content-Disposition: inline Content-Length: 6410 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/glib2/distinfo diff -u pkgsrc/devel/glib2/distinfo:1.312 pkgsrc/devel/glib2/distinfo:1.313 --- pkgsrc/devel/glib2/distinfo:1.312 Tue Jul 11 05:54:33 2023 +++ pkgsrc/devel/glib2/distinfo Tue Aug 22 14:09:37 2023 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.312 2023/07/11 05:54:33 adam Exp $ +$NetBSD: distinfo,v 1.313 2023/08/22 14:09:37 schmonz Exp $ BLAKE2s (glib-2.76.4.tar.xz) = feba1f5bb8ae7a2f37d322490f218021dfd2a934289df2c3dccf4c7ee8af2a5d SHA512 (glib-2.76.4.tar.xz) = f76932dc5090a44880373228e2b162f338415d06f7c90f2950eab1a43bb191c56a1797da4d377594f6a999197fef4defb848039259cfa4105bb68288a928f5b7 @@ -12,7 +12,7 @@ SHA1 (patch-gio_gunixcredentialsmessage. SHA1 (patch-gio_gunixmounts.c) = 48b6945fde5b1721ca246eb7e79f73b5b480e816 SHA1 (patch-gio_inotify_inotify-kernel.c) = 78544b4c32ef3b44e8721b1c07407f46a9e8c8a4 SHA1 (patch-gio_meson.build) = 317da05e008d7bbdbc4c02c3057e8bef514fafae -SHA1 (patch-gio_tests_meson.build) = 6e02b4b16b7e668e91b6d308b70c3e5492aef038 +SHA1 (patch-gio_tests_meson.build) = 9fa1bdc65768c288d273298a75280485b7bff350 SHA1 (patch-glib_gatomic.c) = deb2e74010523ad41ce141aa2f49b807ba2672e6 SHA1 (patch-glib_gatomic.h) = d1c39c3594a5c89d196349e5eafb5512795f55f8 SHA1 (patch-glib_genviron.c) = dd25be36536d56dfe933225d785eb65f753c4a97 Index: pkgsrc/devel/glib2/patches/patch-gio_tests_meson.build diff -u pkgsrc/devel/glib2/patches/patch-gio_tests_meson.build:1.7 pkgsrc/devel/glib2/patches/patch-gio_tests_meson.build:1.8 --- pkgsrc/devel/glib2/patches/patch-gio_tests_meson.build:1.7 Sat May 20 11:53:10 2023 +++ pkgsrc/devel/glib2/patches/patch-gio_tests_meson.build Tue Aug 22 14:09:37 2023 @@ -1,82 +1,82 @@ -$NetBSD: patch-gio_tests_meson.build,v 1.7 2023/05/20 11:53:10 bacon Exp $ +$NetBSD: patch-gio_tests_meson.build,v 1.8 2023/08/22 14:09:37 schmonz Exp $ Work around PR pkg/57399. + DYLD_LIBRARY_PATH for macOS ---- gio/tests/meson.build 2023-02-23 21:54:27.000000000 +0800 -+++ gio/tests/meson.build 2023-05-16 13:37:44.000000000 +0800 -@@ -662,6 +662,10 @@ +--- gio/tests/meson.build.orig 2023-07-06 15:39:47.000000000 +0000 ++++ gio/tests/meson.build +@@ -756,6 +756,10 @@ if not meson.is_cross_build() plugin_resources_c = custom_target('plugin-resources.c', input : 'test4.gresource.xml', output : 'plugin-resources.c', + env : { + 'LC_ALL': 'en_US.UTF-8', -+ 'DYLD_FALLBACK_LIBRARY_PATH': '@0@/glib:@0@/gio:@0@/gobject:@0@/gmodule'.replace('@0@', meson.project_build_root()) ++ 'DYLD_LIBRARY_PATH': '@0@/glib:@0@/gio:@0@/gobject:@0@/gmodule'.replace('@0@', meson.project_build_root()) + }, command : [glib_compile_resources, compiler_type, '--target=@OUTPUT@', -@@ -690,6 +694,10 @@ +@@ -785,6 +789,10 @@ if not meson.is_cross_build() test_gresource = custom_target('test.gresource', input : 'test.gresource.xml', output : 'test.gresource', + env : { + 'LC_ALL': 'en_US.UTF-8', -+ 'DYLD_FALLBACK_LIBRARY_PATH': '@0@/glib:@0@/gio:@0@/gobject:@0@/gmodule'.replace('@0@', meson.project_build_root()) ++ 'DYLD_LIBRARY_PATH': '@0@/glib:@0@/gio:@0@/gobject:@0@/gmodule'.replace('@0@', meson.project_build_root()) + }, command : [glib_compile_resources, compiler_type, '--target=@OUTPUT@', -@@ -704,6 +712,10 @@ +@@ -799,6 +807,10 @@ if not meson.is_cross_build() test_resources2_c = custom_target('test_resources2.c', input : 'test3.gresource.xml', output : 'test_resources2.c', + env : { + 'LC_ALL': 'en_US.UTF-8', -+ 'DYLD_FALLBACK_LIBRARY_PATH': '@0@/glib:@0@/gio:@0@/gobject:@0@/gmodule'.replace('@0@', meson.project_build_root()) ++ 'DYLD_LIBRARY_PATH': '@0@/glib:@0@/gio:@0@/gobject:@0@/gmodule'.replace('@0@', meson.project_build_root()) + }, command : [glib_compile_resources, compiler_type, '--target=@OUTPUT@', -@@ -717,6 +729,10 @@ +@@ -812,6 +824,10 @@ if not meson.is_cross_build() test_resources2_h = custom_target('test_resources2.h', input : 'test3.gresource.xml', output : 'test_resources2.h', + env : { + 'LC_ALL': 'en_US.UTF-8', -+ 'DYLD_FALLBACK_LIBRARY_PATH': '@0@/glib:@0@/gio:@0@/gobject:@0@/gmodule'.replace('@0@', meson.project_build_root()) ++ 'DYLD_LIBRARY_PATH': '@0@/glib:@0@/gio:@0@/gobject:@0@/gmodule'.replace('@0@', meson.project_build_root()) + }, command : [glib_compile_resources, compiler_type, '--target=@OUTPUT@', -@@ -731,6 +747,10 @@ +@@ -826,6 +842,10 @@ if not meson.is_cross_build() input : 'test2.gresource.xml', depends : big_test_resource, output : 'test_resources.c', + env : { + 'LC_ALL': 'en_US.UTF-8', -+ 'DYLD_FALLBACK_LIBRARY_PATH': '@0@/glib:@0@/gio:@0@/gobject:@0@/gmodule'.replace('@0@', meson.project_build_root()) ++ 'DYLD_LIBRARY_PATH': '@0@/glib:@0@/gio:@0@/gobject:@0@/gmodule'.replace('@0@', meson.project_build_root()) + }, command : [glib_compile_resources, compiler_type, '--target=@OUTPUT@', -@@ -744,6 +764,10 @@ +@@ -839,6 +859,10 @@ if not meson.is_cross_build() digit_test_resources_c = custom_target('digit_test_resources.c', input : '111_digit_test.gresource.xml', output : 'digit_test_resources.c', + env : { + 'LC_ALL': 'en_US.UTF-8', -+ 'DYLD_FALLBACK_LIBRARY_PATH': '@0@/glib:@0@/gio:@0@/gobject:@0@/gmodule'.replace('@0@', meson.project_build_root()) ++ 'DYLD_LIBRARY_PATH': '@0@/glib:@0@/gio:@0@/gobject:@0@/gmodule'.replace('@0@', meson.project_build_root()) + }, command : [glib_compile_resources, compiler_type, '--target=@OUTPUT@', -@@ -757,6 +781,10 @@ +@@ -852,6 +876,10 @@ if not meson.is_cross_build() digit_test_resources_h = custom_target('digit_test_resources.h', input : '111_digit_test.gresource.xml', output : 'digit_test_resources.h', + env : { + 'LC_ALL': 'en_US.UTF-8', -+ 'DYLD_FALLBACK_LIBRARY_PATH': '@0@/glib:@0@/gio:@0@/gobject:@0@/gmodule'.replace('@0@', meson.project_build_root()) ++ 'DYLD_LIBRARY_PATH': '@0@/glib:@0@/gio:@0@/gobject:@0@/gmodule'.replace('@0@', meson.project_build_root()) + }, command : [glib_compile_resources, compiler_type, --_----------=_169271337756970--