aboutsummaryrefslogtreecommitdiff
path: root/depends/patches
diff options
context:
space:
mode:
authorfanquake <fanquake@gmail.com>2022-07-30 09:58:22 +0100
committerHennadii Stepanov <32963518+hebasto@users.noreply.github.com>2022-07-30 16:03:46 +0100
commitfd0e8df67caebcc3ace10133eaac2e75e4dc5d8b (patch)
tree85210be2862e56975e3ddf7dcf9434203b7243e4 /depends/patches
parentecb617fefe9fbd15365dcf0469d4d39df6b856bc (diff)
qt: use patch over sed for guix CROSS_LIBRARY_PATH change
Diffstat (limited to 'depends/patches')
-rw-r--r--depends/patches/qt/guix_cross_lib_path.patch17
1 files changed, 17 insertions, 0 deletions
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: \