diff options
| author | merge-script <fanquake@gmail.com> | 2024-07-12 09:40:32 +0100 |
|---|---|---|
| committer | merge-script <fanquake@gmail.com> | 2024-07-12 09:40:32 +0100 |
| commit | 66114cd45bcf37cd3cd6b2152311585d5e5560f6 (patch) | |
| tree | 861aee9c377411a6c1afbe4772fe0b9e7e2e7089 /depends | |
| parent | 33af14e31b9fa436029a2bb8c2b11de8feb32f86 (diff) | |
| parent | f170fe04ca03fe4021cbff7c5450ce3cc7fda17f (diff) | |
Merge bitcoin/bitcoin#30336: depends: update doc in Qt pwd patch
f170fe04ca03fe4021cbff7c5450ce3cc7fda17f depends: update doc in Qt pwd patch (fanquake)
Pull request description:
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.
ACKs for top commit:
theuni:
ACK f170fe04ca03fe4021cbff7c5450ce3cc7fda17f
Tree-SHA512: f6db8ccad591b1bf144ce71f873f42a115d394c432a95b6b855e3e32751e6331145e0d9676657599b25fd369af8c72c1bd34e192a7a1062c15f152421422a9ed
Diffstat (limited to 'depends')
| -rw-r--r-- | depends/patches/qt/dont_hardcode_pwd.patch | 14 |
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 |