diff options
Diffstat (limited to 'dev-build/meson/files/0001-Revert-clike-Deduplicate-rpath-linker-flags.patch')
-rw-r--r-- | dev-build/meson/files/0001-Revert-clike-Deduplicate-rpath-linker-flags.patch | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/dev-build/meson/files/0001-Revert-clike-Deduplicate-rpath-linker-flags.patch b/dev-build/meson/files/0001-Revert-clike-Deduplicate-rpath-linker-flags.patch deleted file mode 100644 index 3d40616fec1f..000000000000 --- a/dev-build/meson/files/0001-Revert-clike-Deduplicate-rpath-linker-flags.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 2fbc7b5ce3aced483b196dd10ca9eee1713b7494 Mon Sep 17 00:00:00 2001 -From: Eli Schwartz <eschwartz93@gmail.com> -Date: Tue, 26 Dec 2023 15:06:12 -0500 -Subject: [PATCH] Revert "clike: Deduplicate rpath linker flags" - -This reverts commit 53ea59ad8455277797117d225f326851fe7d369c. - -This breaks at least: -- frameworks/17 mpi -- frameworks/30 scalapack - -The problem is that openmpi's pkg-config emitted link arguments -includes: - -``` --Wl,-rpath -Wl,/path/to/libdir -``` - -The deduplication logic in meson doesn't contain sufficient information -to tell when the compiler is passing an argument that requires values, -and definitely cannot tell when that argument is split across argv. But -for arguments that *can* do this, it is not possible to deduplicate a -single argument as standalone, because it is not standalone. - -The argument for deduplicating rpath here was that if you have multiple -dependencies that all add the same rpath, the Apple ld64 emits a -non-fatal warning "duplicate -rpath ignored". Since this is non-fatal, -it's not a major issue. A major issue is when builds fatally error out -with: - -``` -FAILED: scalapack_c -cc -o scalapack_c scalapack_c.p/main.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,--start-group /usr/lib64/libscalapack.so /usr/lib64/liblapack.so /usr/lib64/libblas.so -Wl,-rpath -Wl,/usr/lib64 -Wl,/usr/lib64 -Wl,--enable-new-dtags /usr/lib64/libmpi.so -Wl,--end-group -/usr/libexec/gcc/x86_64-pc-linux-gnu/ld: error: /usr/lib64: read: Is a directory -``` ---- - mesonbuild/compilers/mixins/clike.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/clike.py -index b3fc96cec..76c8e0413 100644 ---- a/mesonbuild/compilers/mixins/clike.py -+++ b/mesonbuild/compilers/mixins/clike.py -@@ -54,7 +54,7 @@ class CLikeCompilerArgs(arglist.CompilerArgs): - - # NOTE: not thorough. A list of potential corner cases can be found in - # https://github.com/mesonbuild/meson/pull/4593#pullrequestreview-182016038 -- dedup1_prefixes = ('-l', '-Wl,-l', '-Wl,--export-dynamic', '-Wl,-rpath') -+ dedup1_prefixes = ('-l', '-Wl,-l', '-Wl,--export-dynamic') - dedup1_suffixes = ('.lib', '.dll', '.so', '.dylib', '.a') - dedup1_args = ('-c', '-S', '-E', '-pipe', '-pthread') - --- -2.41.0 - |