mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-17 04:37:19 +00:00
Code Issues Projects Releases Wiki Activity

hiredis: Upgrade to 0.14.0

Browse Source 
* Define LIBRARY_PATH so multilibbed version can install correctly
* Forward port patches

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2019-12-18 19:42:59 -08:00
parent c8c31eef9f
commit 2f6c043c0c
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-extended/hiredis/files/0001-Makefile-remove-hardcoding-of-CC.patch
+6 -10
View File
@@ -11,22 +11,18 @@ Signed-off-by: Andrea Galbusera <gizero@gmail.com>
Makefile | 5 ----- Makefile | 5 -----
1 file changed, 5 deletions(-) 1 file changed, 5 deletions(-)
diff --git a/Makefile b/Makefile
index 8b0f0c2..66a4317 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -34,11 +34,6 @@ define REDIS_TEST_CONFIG @@ -35,12 +35,6 @@ define REDIS_TEST_CONFIG
endef endef
export REDIS_TEST_CONFIG export REDIS_TEST_CONFIG
-# Fallback to gcc when $CC is not in $PATH. -# Fallback to gcc when $CC is not in $PATH.
-CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc') -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 -OPTIMIZATION?=-O3
-WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings -WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings
-DEBUG?= -g -ggdb -DEBUG_FLAGS?= -g -ggdb
REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG) $(ARCH) REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS)
REAL_LDFLAGS=$(LDFLAGS) $(ARCH) REAL_LDFLAGS=$(LDFLAGS)
--
1.9.1
meta-oe/recipes-extended/hiredis/hiredis_0.13.1.bb → meta-oe/recipes-extended/hiredis/hiredis_0.14.0.bb
+3 -2
View File
@@ -5,14 +5,15 @@ SECTION = "libs"
DEPENDS = "redis" DEPENDS = "redis"
LIC_FILES_CHKSUM = "file://COPYING;md5=d84d659a35c666d23233e54503aaea51" LIC_FILES_CHKSUM = "file://COPYING;md5=d84d659a35c666d23233e54503aaea51"
SRC_URI = "git://github.com/redis/hiredis;protocol=git;rev=f58dd249d6ed47a7e835463c3b04722972281dbb \ SRCREV = "685030652cd98c5414ce554ff5b356dfe8437870"
SRC_URI = "git://github.com/redis/hiredis;protocol=git \
file://0001-Makefile-remove-hardcoding-of-CC.patch" file://0001-Makefile-remove-hardcoding-of-CC.patch"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
inherit autotools-brokensep pkgconfig inherit autotools-brokensep pkgconfig
EXTRA_OEMAKE = "PREFIX=${prefix}" EXTRA_OEMAKE = "PREFIX=${prefix} LIBRARY_PATH=${baselib}"
# By default INSTALL variable in Makefile is equal to 'cp -a', which preserves # By default INSTALL variable in Makefile is equal to 'cp -a', which preserves
# ownership and causes host-user-contamination QA issue. # ownership and causes host-user-contamination QA issue.