diff --git a/dev-libs/hiredis/hiredis-1.0.2.recipe b/dev-libs/hiredis/hiredis-1.0.2.recipe index c092a7a38..2bbe4fce7 100644 --- a/dev-libs/hiredis/hiredis-1.0.2.recipe +++ b/dev-libs/hiredis/hiredis-1.0.2.recipe @@ -52,8 +52,7 @@ BUILD() cmake -B build -S . \ $cmakeDirArgs \ -DCMAKE_BUILD_TYPE=Release \ - -DENABLE_SSL=ON \ - -DCMAKE_CONF_INSTALL_DIR=$libDir/cmake -L # this doesn't seem to work + -DENABLE_SSL=ON make -C build } @@ -65,11 +64,6 @@ INSTALL() { make -C build install - # move cmake files to the correct directory - mkdir -p $libDir/cmake - mv $prefix/share/* $libDir/cmake/ - rm -rf $prefix/share - prepareInstalledDevelLibs libhiredis libhiredis_ssl fixPkgconfig diff --git a/dev-libs/hiredis/patches/hiredis-1.0.2.patchset b/dev-libs/hiredis/patches/hiredis-1.0.2.patchset index de106ebee..1df43c958 100644 --- a/dev-libs/hiredis/patches/hiredis-1.0.2.patchset +++ b/dev-libs/hiredis/patches/hiredis-1.0.2.patchset @@ -1,4 +1,4 @@ -From 5d179f83a4a3c04f8d18af23e02269eabb7ff0e6 Mon Sep 17 00:00:00 2001 +From 37cf0c0a921ef9df6f0b3bb636842e8e95edc4ae Mon Sep 17 00:00:00 2001 From: begasus Date: Sat, 13 Nov 2021 11:13:55 +0000 Subject: Link against libnetwork @@ -20,5 +20,37 @@ index f86c9b7..95f27e3 100644 CONFIGURE_FILE(hiredis.pc.in hiredis.pc @ONLY) -- -2.30.2 +2.37.3 + + +From 8b61b6bcd562dda7ea3e0f59ab5de21c7d51bd28 Mon Sep 17 00:00:00 2001 +From: Begasus +Date: Sat, 25 Mar 2023 20:31:20 +0100 +Subject: Fix install for the *.cmake files + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 95f27e3..c95b7af 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -76,7 +76,7 @@ export(EXPORT hiredis-targets + FILE "${CMAKE_CURRENT_BINARY_DIR}/hiredis-targets.cmake" + NAMESPACE hiredis::) + +-SET(CMAKE_CONF_INSTALL_DIR share/hiredis) ++SET(CMAKE_CONF_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/hiredis) + SET(INCLUDE_INSTALL_DIR include) + include(CMakePackageConfigHelpers) + configure_package_config_file(hiredis-config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/hiredis-config.cmake +@@ -136,7 +136,7 @@ IF(ENABLE_SSL) + FILE "${CMAKE_CURRENT_BINARY_DIR}/hiredis_ssl-targets.cmake" + NAMESPACE hiredis::) + +- SET(CMAKE_CONF_INSTALL_DIR share/hiredis_ssl) ++ SET(CMAKE_CONF_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/hiredis_ssl) + configure_package_config_file(hiredis_ssl-config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/hiredis_ssl-config.cmake + INSTALL_DESTINATION ${CMAKE_CONF_INSTALL_DIR} + PATH_VARS INCLUDE_INSTALL_DIR) +-- +2.37.3