bear: fix RPATH handling (#33217)

This commit is contained in:
Jonathon Anderson 2022-10-12 03:34:56 -05:00 committed by GitHub
parent 549f6361ce
commit 827e576c3d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 0 deletions

View file

@ -15,15 +15,27 @@ class Bear(CMakePackage):
url = "https://github.com/rizsotto/Bear/archive/2.0.4.tar.gz"
maintainers = ["vmiheer", "trws"]
version("3.0.20", sha256="45cfcdab07f824f6c06c9776701156f7a04b23eadd25ecbc88c188789a447cc7")
version("3.0.19", sha256="2fcfe2c6e029182cfc54ed26b3505c0ef12b0f43df03fb587f335afdc2ca9431")
version("3.0.18", sha256="ae94047c79b4f48462b66981f66a67b6a833d75d4c40e7afead491b1865f1142")
version("3.0.0", sha256="7b68aad69e887d945ad20f8e9f3a8c33cf2d59cc80da7e52d931d8c685fe2f79")
version("2.2.0", sha256="6bd61a6d64a24a61eab17e7f2950e688820c72635e1cf7ea8ea7bf9482f3b612")
version("2.0.4", sha256="33ea117b09068aa2cd59c0f0f7535ad82c5ee473133779f1cc20f6f99793a63e")
depends_on("pkgconf", when="@3:")
depends_on("fmt", when="@3.0.0:")
depends_on("grpc", when="@3.0.0:")
depends_on("nlohmann-json", when="@3.0.0:")
depends_on("spdlog", when="@3.0.0:")
depends_on("cmake@2.8:", type="build")
depends_on("python", type="build")
depends_on("googletest", type="test", when="@3:")
patch("rpath-handling-3.0.20.patch", when="@3.0.20:")
def cmake_args(self):
return [
"-DENABLE_UNIT_TESTS={}".format("ON" if self.run_tests else "OFF"),
"-DENABLE_FUNC_TESTS=OFF",
"-DENABLE_MULTILIB=OFF",
]

View file

@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9e29d10..16795bc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,6 +55,8 @@ ExternalProject_Add(BearSource
-DENABLE_MULTILIB:BOOL=${ENABLE_MULTILIB}
-DPKG_CONFIG_EXECUTABLE:PATH=${PKG_CONFIG_EXECUTABLE}
CMAKE_CACHE_ARGS
+ -DCMAKE_INSTALL_RPATH:STRING=${CMAKE_INSTALL_RPATH}
+ -DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=${CMAKE_INSTALL_RPATH_USE_LINK_PATH}
-DCMAKE_PROJECT_VERSION:STRING=${CMAKE_PROJECT_VERSION}
-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-DCMAKE_TOOLCHAIN_FILE:PATH=${CMAKE_TOOLCHAIN_FILE}