From fd0e8df67caebcc3ace10133eaac2e75e4dc5d8b Mon Sep 17 00:00:00 2001 From: fanquake Date: Sat, 30 Jul 2022 09:58:22 +0100 Subject: qt: use patch over sed for guix CROSS_LIBRARY_PATH change --- depends/patches/qt/guix_cross_lib_path.patch | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 depends/patches/qt/guix_cross_lib_path.patch (limited to 'depends/patches') diff --git a/depends/patches/qt/guix_cross_lib_path.patch b/depends/patches/qt/guix_cross_lib_path.patch new file mode 100644 index 0000000000..0c67743dc1 --- /dev/null +++ b/depends/patches/qt/guix_cross_lib_path.patch @@ -0,0 +1,17 @@ +Facilitate guix building with CROSS_LIBRARY_PATH + +See discussion in https://github.com/bitcoin/bitcoin/pull/15277. + +--- a/qtbase/mkspecs/features/toolchain.prf ++++ b/qtbase/mkspecs/features/toolchain.prf +@@ -231,8 +231,8 @@ isEmpty($${target_prefix}.INCDIRS) { + add_libraries = false + for (line, output) { + line ~= s/^[ \\t]*// # remove leading spaces +- contains(line, "LIBRARY_PATH=.*") { +- line ~= s/^LIBRARY_PATH=// # remove leading LIBRARY_PATH= ++ contains(line, "(CROSS_)?LIBRARY_PATH=.*") { ++ line ~= s/^(CROSS_)?LIBRARY_PATH=// # remove leading (CROSS_)?LIBRARY_PATH= + equals(QMAKE_HOST.os, Windows): \ + paths = $$split(line, ;) + else: \ -- cgit v1.2.3