diff options
| author | sevan <sevan@pkgsrc.org> | 2020-01-23 23:54:22 +0000 |
|---|---|---|
| committer | sevan <sevan@pkgsrc.org> | 2020-01-23 23:54:22 +0000 |
| commit | f7a8e7d6e072f4d17dc9af167322417b844af703 (patch) | |
| tree | 7c962cd51d990a8b5ca8780905a4cd33bc04c19f /devel | |
| parent | c491b8e8b3eaf4327a4cd2d7d0e69cd651e9dad0 (diff) | |
| download | pkgsrc-f7a8e7d6e072f4d17dc9af167322417b844af703.tar.gz | |
Fix build on older Linux distros.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/glib2/distinfo | 4 | ||||
| -rw-r--r-- | devel/glib2/patches/patch-gio_tests_meson.build | 20 |
2 files changed, 21 insertions, 3 deletions
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo index 9cdc62ab74f..d25df34a1ef 100644 --- a/devel/glib2/distinfo +++ b/devel/glib2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.265 2020/01/22 17:09:44 minskim Exp $ +$NetBSD: distinfo,v 1.266 2020/01/23 23:54:22 sevan Exp $ SHA1 (glib-2.62.4.tar.xz) = f9a493c86f98482f13c6ed742c19487e6fa8f34b RMD160 (glib-2.62.4.tar.xz) = 4cac1bc54a690b007c859db2e9d65c33dc97395c @@ -13,7 +13,7 @@ SHA1 (patch-gio_gunixmounts.c) = 13af07fffe898457edd0d8db4296a60fccba913d SHA1 (patch-gio_inotify_inotify-kernel.c) = 78544b4c32ef3b44e8721b1c07407f46a9e8c8a4 SHA1 (patch-gio_meson.build) = c2bda4943f8580706ec45760604ed1bdf63d1c6f SHA1 (patch-gio_tests_gdbus-export.c) = 59d85ca079d02b52e33153c7d2ac1cc48c26707a -SHA1 (patch-gio_tests_meson.build) = 38fbe56f310545163623c5dbd9ba1f8a25e4d928 +SHA1 (patch-gio_tests_meson.build) = aadb773caa5f120f47a4182ae364e9d257839e6c SHA1 (patch-glib_gatomic.c) = 875ad9c828dcf2add356d4988d14fb4f1985aef8 SHA1 (patch-glib_gatomic.h) = 21294cac483c3379198283c54fe6e24af3e630b1 SHA1 (patch-glib_genviron.c) = 7182f5ef2ebc7f17d8d4fb892e946c52c8c0ad1d diff --git a/devel/glib2/patches/patch-gio_tests_meson.build b/devel/glib2/patches/patch-gio_tests_meson.build index f04727f15ab..7b39aeaac25 100644 --- a/devel/glib2/patches/patch-gio_tests_meson.build +++ b/devel/glib2/patches/patch-gio_tests_meson.build @@ -1,6 +1,9 @@ -$NetBSD: patch-gio_tests_meson.build,v 1.1 2020/01/22 17:09:44 minskim Exp $ +$NetBSD: patch-gio_tests_meson.build,v 1.2 2020/01/23 23:54:22 sevan Exp $ Darwin: Set LD_LIBRARY_PATH to run uninstalled executable with @rpath. +Check objcopy(1) supports --add-symbol which may not be available on +legacy systems. +https://gitlab.gnome.org/GNOME/glib/commit/dac4a48d14461a118d8ad7825a39e224bf128807 --- gio/tests/meson.build.orig 2019-12-19 16:33:15.000000000 +0000 +++ gio/tests/meson.build @@ -81,3 +84,18 @@ Darwin: Set LD_LIBRARY_PATH to run uninstalled executable with @rpath. '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), '--generate', +@@ -577,9 +591,13 @@ if not meson.is_cross_build() or meson.h + # Support for --add-symbol was added to LLVM objcopy in 2019 + # (https://reviews.llvm.org/D58234). FIXME: This test could be enabled for + # LLVM once that support is in a stable release. ++ objcopy_valid = false + objcopy = find_program('objcopy', required : false) ++ if objcopy.found() ++ objcopy_valid = run_command(objcopy, '--help').stdout().contains('--add-symbol') ++ endif + +- if build_machine.system() == 'linux' and cc.get_id() == 'gcc' and objcopy.found() ++ if build_machine.system() == 'linux' and cc.get_id() == 'gcc' and objcopy.found() and objcopy_valid + test_gresource_binary = custom_target('test5.gresource', + input : 'test5.gresource.xml', + output : 'test5.gresource', |