diff options
Diffstat (limited to 'meta-oe/recipes-extended/hiredis')
5 files changed, 42 insertions, 169 deletions
diff --git a/meta-oe/recipes-extended/hiredis/files/0001-CMake-configuration-for-hiredis.patch b/meta-oe/recipes-extended/hiredis/files/0001-CMake-configuration-for-hiredis.patch deleted file mode 100644 index 139d13f4cb..0000000000 --- a/meta-oe/recipes-extended/hiredis/files/0001-CMake-configuration-for-hiredis.patch +++ /dev/null @@ -1,117 +0,0 @@ -From 2dc0c7e4a3fa7ecc92ee5e22f1d8ee48c2b333a8 Mon Sep 17 00:00:00 2001 -From: Thomas Lee <debian@tomlee.co> -Date: Sun, 4 Nov 2018 22:59:09 +0000 -Subject: [PATCH] CMake configuration for hiredis - -Last-Update: 2018-09-26 - -Upstream-Status: Backport [Ubuntu 20.04] ---- - HiredisConfig.cmake.in | 5 +++++ - HiredisConfigVersion.cmake.in | 22 ++++++++++++++++++++++ - Makefile | 17 ++++++++++++++++- - 3 files changed, 43 insertions(+), 1 deletion(-) - create mode 100644 HiredisConfig.cmake.in - create mode 100644 HiredisConfigVersion.cmake.in - -diff --git a/HiredisConfig.cmake.in b/HiredisConfig.cmake.in -new file mode 100644 -index 0000000..2cce290 ---- /dev/null -+++ b/HiredisConfig.cmake.in -@@ -0,0 +1,5 @@ -+find_path(HIREDIS_INCLUDE_DIRS hiredis/hiredis.h HINTS "/usr/include") -+find_library(HIREDIS_LIB_HIREDIS NAMES hiredis HINTS "/usr/lib") -+ -+set(HIREDIS_LIBRARIES ${HIREDIS_LIB_HIREDIS}) -+ -diff --git a/HiredisConfigVersion.cmake.in b/HiredisConfigVersion.cmake.in -new file mode 100644 -index 0000000..584144a ---- /dev/null -+++ b/HiredisConfigVersion.cmake.in -@@ -0,0 +1,22 @@ -+set(PACKAGE_VERSION "@HIREDIS_VERSION@") -+ -+string(REPLACE "." ";" HIREDIS_VERSION_COMPONENTS ${PACKAGE_VERSION}) -+string(REPLACE "." ";" REQUESTED_VERSION_COMPONENTS ${PACKAGE_FIND_VERSION}) -+ -+list(GET HIREDIS_VERSION_COMPONENTS 0 HIREDIS_VERSION_MAJOR) -+list(GET HIREDIS_VERSION_COMPONENTS 1 HIREDIS_VERSION_MINOR) -+ -+list(GET REQUESTED_VERSION_COMPONENTS 0 REQUESTED_VERSION_MAJOR) -+list(GET REQUESTED_VERSION_COMPONENTS 1 REQUESTED_VERSION_MINOR) -+ -+if(("${HIREDIS_VERSION_MAJOR}" EQUAL "${REQUESTED_VERSION_MAJOR}") AND -+ (("${HIREDIS_VERSION_MINOR}" EQUAL "${REQUESTED_VERSION_MINOR}") OR -+ ("${HIREDIS_VERSION_MINOR}" GREATER "${REQUESTED_VERSION_MINOR}"))) -+ set(PACKAGE_VERSION_COMPATIBLE TRUE) -+ if("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}") -+ set(PACKAGE_VERSION_EXACT TRUE) -+ endif() -+else() -+ set(PACKAGE_VERSION_COMPATIBLE FALSE) -+endif() -+ -diff --git a/Makefile b/Makefile -index 339727f..43704cd 100644 ---- a/Makefile -+++ b/Makefile -@@ -8,6 +8,8 @@ EXAMPLES=hiredis-example hiredis-example-libevent hiredis-example-libev hiredis- - TESTS=hiredis-test - LIBNAME=libhiredis - PKGCONFNAME=hiredis.pc -+CMAKECONFNAME=HiredisConfig.cmake -+CMAKEVERSNAME=HiredisConfigVersion.cmake - - HIREDIS_MAJOR=$(shell grep HIREDIS_MAJOR hiredis.h | awk '{print $$3}') - HIREDIS_MINOR=$(shell grep HIREDIS_MINOR hiredis.h | awk '{print $$3}') -@@ -19,9 +21,11 @@ PREFIX?=/usr/local - INCLUDE_PATH?=include/hiredis - LIBRARY_PATH?=lib - PKGCONF_PATH?=pkgconfig -+CMAKE_PATH?=cmake/Hiredis - INSTALL_INCLUDE_PATH= $(DESTDIR)$(PREFIX)/$(INCLUDE_PATH) - INSTALL_LIBRARY_PATH= $(DESTDIR)$(PREFIX)/$(LIBRARY_PATH) - INSTALL_PKGCONF_PATH= $(INSTALL_LIBRARY_PATH)/$(PKGCONF_PATH) -+INSTALL_CMAKE_PATH= $(INSTALL_LIBRARY_PATH)/$(CMAKE_PATH) - - # redis-server configuration used for testing - REDIS_PORT=56379 -@@ -150,6 +154,7 @@ check: hiredis-test - - clean: - rm -rf $(DYLIBNAME) $(STLIBNAME) $(TESTS) $(PKGCONFNAME) examples/hiredis-example* *.o *.gcda *.gcno *.gcov -+ rm -f $(CMAKECONFNAME) $(CMAKEVERSNAME) - - dep: - $(CC) -MM *.c -@@ -169,7 +174,14 @@ $(PKGCONFNAME): hiredis.h - @echo Libs: -L\$${libdir} -lhiredis >> $@ - @echo Cflags: -I\$${includedir} -D_FILE_OFFSET_BITS=64 >> $@ - --install: $(DYLIBNAME) $(STLIBNAME) $(PKGCONFNAME) -+$(CMAKECONFNAME): $(CMAKECONFNAME).in -+ cp $(CMAKECONFNAME).in $(CMAKECONFNAME) -+ -+$(CMAKEVERSNAME): $(CMAKEVERSNAME).in -+ sed -e "s,@HIREDIS_VERSION@,$(HIREDIS_MAJOR).$(HIREDIS_MINOR).$(HIREDIS_PATCH),g" \ -+ $(CMAKEVERSNAME).in >$(CMAKEVERSNAME) -+ -+install: $(DYLIBNAME) $(STLIBNAME) $(PKGCONFNAME) $(CMAKECONFNAME) $(CMAKEVERSNAME) - mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_INCLUDE_PATH)/adapters $(INSTALL_LIBRARY_PATH) - $(INSTALL) hiredis.h async.h read.h sds.h $(INSTALL_INCLUDE_PATH) - $(INSTALL) adapters/*.h $(INSTALL_INCLUDE_PATH)/adapters -@@ -178,6 +190,9 @@ install: $(DYLIBNAME) $(STLIBNAME) $(PKGCONFNAME) - $(INSTALL) $(STLIBNAME) $(INSTALL_LIBRARY_PATH) - mkdir -p $(INSTALL_PKGCONF_PATH) - $(INSTALL) $(PKGCONFNAME) $(INSTALL_PKGCONF_PATH) -+ mkdir -p $(INSTALL_CMAKE_PATH) -+ $(INSTALL) $(CMAKECONFNAME) $(INSTALL_CMAKE_PATH) -+ $(INSTALL) $(CMAKEVERSNAME) $(INSTALL_CMAKE_PATH) - - 32bit: - @echo "" --- -2.27.0 - diff --git a/meta-oe/recipes-extended/hiredis/files/0001-Makefile-remove-hardcoding-of-CC.patch b/meta-oe/recipes-extended/hiredis/files/0001-Makefile-remove-hardcoding-of-CC.patch deleted file mode 100644 index 1af5d26ac0..0000000000 --- a/meta-oe/recipes-extended/hiredis/files/0001-Makefile-remove-hardcoding-of-CC.patch +++ /dev/null @@ -1,28 +0,0 @@ -From d13b918a3ff8b0ebfd1e7b18b198b4b45841d720 Mon Sep 17 00:00:00 2001 -From: Andrea Galbusera <gizero@gmail.com> -Date: Fri, 31 Jul 2015 16:42:08 +0200 -Subject: [PATCH] Makefile: remove hardcoding of CC - -* upgrade previous patch to avoid wiping CFLAGS. This fixes build on arm -platforms which previously caused and issue due to -fPIC being lost - -Signed-off-by: Andrea Galbusera <gizero@gmail.com> ---- - Makefile | 5 ----- - 1 file changed, 5 deletions(-) - ---- a/Makefile -+++ b/Makefile -@@ -35,12 +35,6 @@ define REDIS_TEST_CONFIG - endef - export REDIS_TEST_CONFIG - --# Fallback to gcc when $CC is not in $PATH. --CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc') --CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++') --OPTIMIZATION?=-O3 --WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings --DEBUG_FLAGS?= -g -ggdb - REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) - REAL_LDFLAGS=$(LDFLAGS) - diff --git a/meta-oe/recipes-extended/hiredis/hiredis/run-ptest b/meta-oe/recipes-extended/hiredis/hiredis/run-ptest new file mode 100644 index 0000000000..59b747dbd8 --- /dev/null +++ b/meta-oe/recipes-extended/hiredis/hiredis/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +TEST_SSL=0 TEST_ASYNC=0 ./test.sh diff --git a/meta-oe/recipes-extended/hiredis/hiredis_0.14.0.bb b/meta-oe/recipes-extended/hiredis/hiredis_0.14.0.bb deleted file mode 100644 index a41888802f..0000000000 --- a/meta-oe/recipes-extended/hiredis/hiredis_0.14.0.bb +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "Minimalistic C client library for Redis" -HOMEPAGE = "http://github.com/redis/hiredis" -LICENSE = "BSD-3-Clause" -SECTION = "libs" -DEPENDS = "redis" - -LIC_FILES_CHKSUM = "file://COPYING;md5=d84d659a35c666d23233e54503aaea51" -SRCREV = "685030652cd98c5414ce554ff5b356dfe8437870" -SRC_URI = "git://github.com/redis/hiredis;protocol=git \ - file://0001-Makefile-remove-hardcoding-of-CC.patch \ - file://0001-CMake-configuration-for-hiredis.patch" - -S = "${WORKDIR}/git" - -inherit autotools-brokensep pkgconfig - -EXTRA_OEMAKE = "PREFIX=${prefix} LIBRARY_PATH=${baselib}" - -# By default INSTALL variable in Makefile is equal to 'cp -a', which preserves -# ownership and causes host-user-contamination QA issue. -# And PREFIX defaults to /usr/local. -do_install_prepend() { - export INSTALL='cp -r' -} diff --git a/meta-oe/recipes-extended/hiredis/hiredis_1.2.0.bb b/meta-oe/recipes-extended/hiredis/hiredis_1.2.0.bb new file mode 100644 index 0000000000..d081242736 --- /dev/null +++ b/meta-oe/recipes-extended/hiredis/hiredis_1.2.0.bb @@ -0,0 +1,39 @@ +DESCRIPTION = "Minimalistic C client library for Redis" +HOMEPAGE = "http://github.com/redis/hiredis" +SECTION = "libs" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=d84d659a35c666d23233e54503aaea51" + +SRC_URI = " \ + git://github.com/redis/hiredis;protocol=https;branch=master \ + file://run-ptest \ + " +SRCREV = "60e5075d4ac77424809f855ba3e398df7aacefe8" + +S = "${WORKDIR}/git" + +inherit cmake ptest + +# 'testssl' is not enabled by default as redis recipe does not build with ssl support +# option 'testssl' requires 'ssl' +PACKAGECONFIG ??= "ssl ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'test testasync', '', d)}" +PACKAGECONFIG[ssl] = "-DENABLE_SSL=ON, -DENABLE_SSL=OFF, openssl" +PACKAGECONFIG[test] = "-DDISABLE_TESTS=OFF, -DDISABLE_TESTS=ON" +PACKAGECONFIG[testssl] = "-DENABLE_SSL_TESTS=ON, -DENABLE_SSL_TESTS=OFF, openssl" +PACKAGECONFIG[testasync] = "-DENABLE_ASYNC_TESTS=ON, -DENABLE_ASYNC_TESTS=OFF, libevent" + +do_install_ptest() { + install ${S}/test.sh ${D}${PTEST_PATH}/ + install ${B}/hiredis-test ${D}${PTEST_PATH}/ + if ${@bb.utils.contains('PACKAGECONFIG','testssl','true','false',d)}; then + sed -i 's/TEST_SSL=0/TEST_SSL=1/g' ${D}${PTEST_PATH}/run-ptest + fi + if ${@bb.utils.contains('PACKAGECONFIG','testasync','true','false',d)}; then + sed -i 's/TEST_ASYNC=0/TEST_ASYNC=1/g' ${D}${PTEST_PATH}/run-ptest + fi +} + +FILES:${PN}-dev += "${datadir}/hiredis_ssl ${prefix}/build" + +RDEPENDS:${PN} = "redis" +RDEPENDS:${PN}-ptest = "${@bb.utils.contains('PACKAGECONFIG', 'testssl', 'openssl-bin', '', d)}" |