Skip to content

Commit 66114cd

Browse files
committed
Merge bitcoin/bitcoin#30336: depends: update doc in Qt pwd patch
f170fe0 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: qt/qtbase@3388de6. ACKs for top commit: theuni: ACK f170fe0 Tree-SHA512: f6db8ccad591b1bf144ce71f873f42a115d394c432a95b6b855e3e32751e6331145e0d9676657599b25fd369af8c72c1bd34e192a7a1062c15f152421422a9ed
2 parents 33af14e + f170fe0 commit 66114cd

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

depends/patches/qt/dont_hardcode_pwd.patch

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
commit 0e953866fc4672486e29e1ba6d83b4207e7b2f0b
2-
Author: fanquake <fanquake@gmail.com>
3-
Date: Tue Aug 18 15:09:06 2020 +0800
1+
Do not assume FHS in scripts
42

5-
Don't hardcode pwd path
3+
On systems that do not follow the Filesystem Hierarchy Standard, such as
4+
guix, the hardcoded `/bin/pwd` will fail to be found so that the script
5+
will fail.
66

7-
Let a man use his builtins if he wants to! Also, removes the unnecessary
8-
assumption that pwd lives under /bin/pwd.
7+
Use `pwd`, instead, so that the command can be found through the normal
8+
path search mechanism.
99

10-
See #15581.
10+
See https://github.com/qt/qtbase/commit/3388de698bfb9bbc456c08f03e83bf3e749df35c.
1111

1212
diff --git a/qtbase/configure b/qtbase/configure
1313
index 08b49a8d..faea5b55 100755

0 commit comments

Comments
 (0)