guix_cross_lib_path.patch raw

   1  Facilitate guix building with CROSS_LIBRARY_PATH
   2  
   3  See discussion in https://github.com/limenka/limenka/pull/15277.
   4  
   5  --- a/qtbase/mkspecs/features/toolchain.prf
   6  +++ b/qtbase/mkspecs/features/toolchain.prf
   7  @@ -236,8 +236,8 @@ isEmpty($${target_prefix}.INCDIRS) {
   8               add_libraries = false
   9               for (line, output) {
  10                   line ~= s/^[ \\t]*//  # remove leading spaces
  11  -                contains(line, "LIBRARY_PATH=.*") {
  12  -                    line ~= s/^LIBRARY_PATH=//  # remove leading LIBRARY_PATH=
  13  +                contains(line, "(CROSS_)?LIBRARY_PATH=.*") {
  14  +                    line ~= s/^(CROSS_)?LIBRARY_PATH=//  # remove leading (CROSS_)?LIBRARY_PATH=
  15                       equals(QMAKE_HOST.os, Windows): \
  16                           paths = $$split(line, ;)
  17                       else: \
  18