aboutsummaryrefslogtreecommitdiff
path: root/depends
diff options
context:
space:
mode:
authorfanquake <fanquake@gmail.com>2024-06-25 16:57:14 +0100
committerfanquake <fanquake@gmail.com>2024-06-25 16:58:00 +0100
commitf170fe04ca03fe4021cbff7c5450ce3cc7fda17f (patch)
tree86f2b16982e340b9fa093a9d77d01b9ba37778e8 /depends
parent323b0acfcb9380ce4b3c12a3d0b341d7bb3bfe08 (diff)
downloadbitcoin-f170fe04ca03fe4021cbff7c5450ce3cc7fda17f.tar.xz
depends: update doc in Qt pwd patch
Now that upstream has gotten around to fixing this. We don't need any more of the patch, and it likely wont apply to our version of Qt in any case. See: https://github.com/qt/qtbase/commit/3388de698bfb9bbc456c08f03e83bf3e749df35c.
Diffstat (limited to 'depends')
-rw-r--r--depends/patches/qt/dont_hardcode_pwd.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/depends/patches/qt/dont_hardcode_pwd.patch b/depends/patches/qt/dont_hardcode_pwd.patch
index a74e9cb098..f6955b2f20 100644
--- a/depends/patches/qt/dont_hardcode_pwd.patch
+++ b/depends/patches/qt/dont_hardcode_pwd.patch
@@ -1,13 +1,13 @@
-commit 0e953866fc4672486e29e1ba6d83b4207e7b2f0b
-Author: fanquake <fanquake@gmail.com>
-Date: Tue Aug 18 15:09:06 2020 +0800
+Do not assume FHS in scripts
- Don't hardcode pwd path
+On systems that do not follow the Filesystem Hierarchy Standard, such as
+guix, the hardcoded `/bin/pwd` will fail to be found so that the script
+will fail.
- Let a man use his builtins if he wants to! Also, removes the unnecessary
- assumption that pwd lives under /bin/pwd.
+Use `pwd`, instead, so that the command can be found through the normal
+path search mechanism.
- See #15581.
+See https://github.com/qt/qtbase/commit/3388de698bfb9bbc456c08f03e83bf3e749df35c.
diff --git a/qtbase/configure b/qtbase/configure
index 08b49a8d..faea5b55 100755