diff options
Diffstat (limited to 'meta-oe/recipes-extended/hiredis')
4 files changed, 42 insertions, 51 deletions
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 29f8de8d2f..0000000000 --- a/meta-oe/recipes-extended/hiredis/hiredis_0.14.0.bb +++ /dev/null @@ -1,23 +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" - -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)}" |