diff options
Diffstat (limited to 'pkgs/development/tools/build-managers/bear/no-double-relative.patch')
| -rw-r--r-- | pkgs/development/tools/build-managers/bear/no-double-relative.patch | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/pkgs/development/tools/build-managers/bear/no-double-relative.patch b/pkgs/development/tools/build-managers/bear/no-double-relative.patch index 257c7ffea38..e8087feb1af 100644 --- a/pkgs/development/tools/build-managers/bear/no-double-relative.patch +++ b/pkgs/development/tools/build-managers/bear/no-double-relative.patch @@ -1,22 +1,27 @@ -diff --git i/source/config.h.in w/source/config.h.in -index ffcce3a..0caba6d 100644 ---- i/source/config.h.in -+++ w/source/config.h.in -@@ -107,7 +107,7 @@ namespace cmd { +diff --git a/source/config.h.in b/source/config.h.in +index 6b659c2..f7bdf22 100644 +--- a/source/config.h.in ++++ b/source/config.h.in +@@ -108,8 +108,8 @@ namespace cmd { } namespace wrapper { -- constexpr char DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@PRIVATE_INSTALLDIR@/wrapper"; -+ constexpr char DEFAULT_PATH[] = "@PRIVATE_INSTALLDIR@/wrapper"; - constexpr char DEFAULT_DIR_PATH[] = "@ROOT_INSTALL_PREFIX@/@PRIVATE_INSTALLDIR@/wrapper.d"; +- constexpr char DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/bear/wrapper"; +- constexpr char DEFAULT_DIR_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/bear/wrapper.d"; ++ constexpr char DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBDIR@/bear/wrapper"; ++ constexpr char DEFAULT_DIR_PATH[] = "@CMAKE_INSTALL_LIBDIR@/bear/wrapper.d"; constexpr char FLAG_VERBOSE[] = "--verbose"; -@@ -120,7 +120,7 @@ namespace cmd { - } - - namespace library { -- constexpr char DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@PRIVATE_INSTALLDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; -+ constexpr char DEFAULT_PATH[] = "@PRIVATE_INSTALLDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; - + constexpr char FLAG_DESTINATION[] = "--destination"; +@@ -134,9 +134,9 @@ namespace cmd { + // And use the `libexec.so` path default value with a single path, + // that matches both. (The match can be achieved by the $LIB token + // expansion from the dynamic loader. See `man ld.so` for more.) +- constexpr char DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/$LIB/bear/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; ++ constexpr char DEFAULT_PATH[] = "$LIB/bear/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; + #else +- constexpr char DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/bear/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; ++ constexpr char DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBDIR@/bear/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; + #endif constexpr char KEY_REPORTER[] = "INTERCEPT_REPORT_COMMAND"; constexpr char KEY_DESTINATION[] = "INTERCEPT_REPORT_DESTINATION"; |