mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-04 14:39:54 +00:00
hiredis: Upgrade to 0.14.0
* 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:
@@ -11,22 +11,18 @@ Signed-off-by: Andrea Galbusera <gizero@gmail.com>
|
||||
Makefile | 5 -----
|
||||
1 file changed, 5 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 8b0f0c2..66a4317 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -34,11 +34,6 @@ define REDIS_TEST_CONFIG
|
||||
@@ -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')
|
||||
-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?= -g -ggdb
|
||||
REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG) $(ARCH)
|
||||
REAL_LDFLAGS=$(LDFLAGS) $(ARCH)
|
||||
-DEBUG_FLAGS?= -g -ggdb
|
||||
REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS)
|
||||
REAL_LDFLAGS=$(LDFLAGS)
|
||||
|
||||
--
|
||||
1.9.1
|
||||
|
||||
|
||||
+3
-2
@@ -5,14 +5,15 @@ SECTION = "libs"
|
||||
DEPENDS = "redis"
|
||||
|
||||
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"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
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
|
||||
# ownership and causes host-user-contamination QA issue.
|
||||
Reference in New Issue
Block a user