diff --git a/dev-libs/hiredis/hiredis-1.0.2.recipe b/dev-libs/hiredis/hiredis-1.3.0.recipe similarity index 77% rename from dev-libs/hiredis/hiredis-1.0.2.recipe rename to dev-libs/hiredis/hiredis-1.3.0.recipe index e1a8f9e7f..a2fabfc0e 100644 --- a/dev-libs/hiredis/hiredis-1.0.2.recipe +++ b/dev-libs/hiredis/hiredis-1.3.0.recipe @@ -9,19 +9,22 @@ HOMEPAGE="https://github.com/redis/hiredis" COPYRIGHT="2009-2011, Salvatore Sanfilippo 2010-2011, Pieter Noordhuis" LICENSE="BSD (3-clause)" -REVISION="3" +REVISION="1" SOURCE_URI="$HOMEPAGE/archive/refs/tags/v$portVersion.tar.gz" -CHECKSUM_SHA256="e0ab696e2f07deb4252dda45b703d09854e53b9703c7d52182ce5a22616c3819" +CHECKSUM_SHA256="25cee4500f359cf5cad3b51ed62059aadfc0939b05150c1f19c7e2829123631c" SOURCE_FILENAME="hiredis-v$portVersion.tar.gz" PATCHES="hiredis-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" +libVersion="$portVersion" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" + PROVIDES=" hiredis$secondaryArchSuffix = $portVersion - lib:libhiredis$secondaryArchSuffix = 1.0.0 - lib:libhiredis_ssl$secondaryArchSuffix = 1.0.0 + lib:libhiredis$secondaryArchSuffix = $libVersionCompat + lib:libhiredis_ssl$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix @@ -30,8 +33,8 @@ REQUIRES=" PROVIDES_devel=" hiredis${secondaryArchSuffix}_devel = $portVersion - devel:libhiredis$secondaryArchSuffix = 1.0.0 - devel:libhiredis_ssl$secondaryArchSuffix = 1.0.0 + devel:libhiredis$secondaryArchSuffix = $libVersionCompat + devel:libhiredis_ssl$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" hiredis$secondaryArchSuffix == $portVersion base @@ -52,7 +55,8 @@ BUILD() cmake -B build -S . \ $cmakeDirArgs \ -DCMAKE_BUILD_TYPE=Release \ - -DENABLE_SSL=ON + -DENABLE_SSL=ON \ + -DENABLE_NUGET=OFF make -C build } diff --git a/dev-libs/hiredis/patches/hiredis-1.0.2.patchset b/dev-libs/hiredis/patches/hiredis-1.0.2.patchset deleted file mode 100644 index 1df43c958..000000000 --- a/dev-libs/hiredis/patches/hiredis-1.0.2.patchset +++ /dev/null @@ -1,56 +0,0 @@ -From 37cf0c0a921ef9df6f0b3bb636842e8e95edc4ae Mon Sep 17 00:00:00 2001 -From: begasus -Date: Sat, 13 Nov 2021 11:13:55 +0000 -Subject: Link against libnetwork - - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f86c9b7..95f27e3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -49,6 +49,10 @@ IF(WIN32 OR MINGW) - TARGET_LINK_LIBRARIES(hiredis PRIVATE ws2_32) - ENDIF() - -+if(HAIKU) -+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lnetwork") -+endif(HAIKU) -+ - TARGET_INCLUDE_DIRECTORIES(hiredis PUBLIC $ $) - - CONFIGURE_FILE(hiredis.pc.in hiredis.pc @ONLY) --- -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 - diff --git a/dev-libs/hiredis/patches/hiredis-1.3.0.patchset b/dev-libs/hiredis/patches/hiredis-1.3.0.patchset new file mode 100644 index 000000000..2cec3b279 --- /dev/null +++ b/dev-libs/hiredis/patches/hiredis-1.3.0.patchset @@ -0,0 +1,22 @@ +From bebeb92ae13a8c00aac5ced42f1c40dc6ee1a1f0 Mon Sep 17 00:00:00 2001 +From: begasus +Date: Sat, 13 Nov 2021 11:13:55 +0000 +Subject: Link against libnetwork + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4093785..5a5ab2c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -65,6 +65,8 @@ ELSEIF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") + TARGET_LINK_LIBRARIES(hiredis PUBLIC m) + ELSEIF(CMAKE_SYSTEM_NAME MATCHES "SunOS") + TARGET_LINK_LIBRARIES(hiredis PUBLIC socket) ++ELSEIF(HAIKU) ++ TARGET_LINK_LIBRARIES(hiredis PUBLIC network) + ENDIF() + + TARGET_INCLUDE_DIRECTORIES(hiredis PUBLIC $ $) +-- +2.50.1 +