diff options
| author | Etienne Laurin <etienne@atnnn.com> | 2020-10-17 20:24:36 +0000 |
|---|---|---|
| committer | Etienne Laurin <etienne@atnnn.com> | 2020-10-17 20:24:36 +0000 |
| commit | 70b79e8cf2402d43c825fcd9b443c6e7fc9fbf56 (patch) | |
| tree | 3842600caad008f144d11942ef6fb08adaba33a7 /pkgs/development/libraries/gtest | |
| parent | c8ccfdb5f4a59d371eb589308679b55783b393b8 (diff) | |
fix(gtest): pkgconfig paths
Diffstat (limited to 'pkgs/development/libraries/gtest')
| -rw-r--r-- | pkgs/development/libraries/gtest/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/libraries/gtest/fix-pkgconfig-paths.patch | 69 |
2 files changed, 70 insertions, 0 deletions
diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix index 62234651aa93..0242360aa08e 100644 --- a/pkgs/development/libraries/gtest/default.nix +++ b/pkgs/development/libraries/gtest/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { patches = [ ./fix-cmake-config-includedir.patch + ./fix-pkgconfig-paths.patch ]; nativeBuildInputs = [ cmake ninja ]; diff --git a/pkgs/development/libraries/gtest/fix-pkgconfig-paths.patch b/pkgs/development/libraries/gtest/fix-pkgconfig-paths.patch new file mode 100644 index 000000000000..3f3932590926 --- /dev/null +++ b/pkgs/development/libraries/gtest/fix-pkgconfig-paths.patch @@ -0,0 +1,69 @@ +From 5126ff48d9ac54828d1947d1423a5ef2a8efee3b Mon Sep 17 00:00:00 2001 +From: David Seifert <soap@gentoo.org> +Date: Sat, 5 Oct 2019 15:58:45 +0200 +Subject: [PATCH] Revert "Use pcfiledir for prefix in pkgconfig file" + +The change makes implicit assumptions on the layout of the install +tree, which is going to break in many ways. + +The correct solution is to use the `PKG_CONFIG_SYSROOT_DIR` variable +to inject the cross-compiled sysroot into `-I` and `-L` paths. +--- + googlemock/cmake/gmock.pc.in | 5 ++--- + googlemock/cmake/gmock_main.pc.in | 5 ++--- + googletest/cmake/gtest.pc.in | 5 ++--- + googletest/cmake/gtest_main.pc.in | 5 ++--- + 4 files changed, 8 insertions(+), 12 deletions(-) + +diff --git a/googlemock/cmake/gmock.pc.in b/googlemock/cmake/gmock.pc.in +index 08e045474..2ef0fbca1 100644 +--- a/googlemock/cmake/gmock.pc.in ++++ b/googlemock/cmake/gmock.pc.in +@@ -1,6 +1,5 @@ +-prefix=${pcfiledir}/../.. +-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: gmock + Description: GoogleMock (without main() function) +diff --git a/googlemock/cmake/gmock_main.pc.in b/googlemock/cmake/gmock_main.pc.in +index b22fe6148..04658fe2e 100644 +--- a/googlemock/cmake/gmock_main.pc.in ++++ b/googlemock/cmake/gmock_main.pc.in +@@ -1,6 +1,5 @@ +-prefix=${pcfiledir}/../.. +-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: gmock_main + Description: GoogleMock (with main() function) +diff --git a/googletest/cmake/gtest.pc.in b/googletest/cmake/gtest.pc.in +index 9aae29e26..e7967ad56 100644 +--- a/googletest/cmake/gtest.pc.in ++++ b/googletest/cmake/gtest.pc.in +@@ -1,6 +1,5 @@ +-prefix=${pcfiledir}/../.. +-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: gtest + Description: GoogleTest (without main() function) +diff --git a/googletest/cmake/gtest_main.pc.in b/googletest/cmake/gtest_main.pc.in +index 915f2973a..fe25d9c73 100644 +--- a/googletest/cmake/gtest_main.pc.in ++++ b/googletest/cmake/gtest_main.pc.in +@@ -1,6 +1,5 @@ +-prefix=${pcfiledir}/../.. +-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: gtest_main + Description: GoogleTest (with main() function) |