dont_hardcode_pwd.patch raw

   1  Do not assume FHS in scripts
   2  
   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.
   6  
   7  Use `pwd`, instead, so that the command can be found through the normal
   8  path search mechanism.
   9  
  10  See https://github.com/qt/qtbase/commit/3388de698bfb9bbc456c08f03e83bf3e749df35c.
  11  
  12  diff --git a/qtbase/configure b/qtbase/configure
  13  index 08b49a8d..faea5b55 100755
  14  --- a/qtbase/configure
  15  +++ b/qtbase/configure
  16  @@ -36,9 +36,9 @@
  17   relconf=`basename $0`
  18   # the directory of this script is the "source tree"
  19   relpath=`dirname $0`
  20  -relpath=`(cd "$relpath"; /bin/pwd)`
  21  +relpath=`(cd "$relpath"; pwd)`
  22   # the current directory is the "build tree" or "object tree"
  23  -outpath=`/bin/pwd`
  24  +outpath=`pwd`
  25  
  26   WHICH="which"
  27  
  28