diff options
Diffstat (limited to 'meta-oe/recipes-extended/redis/redis/lua-update-Makefile-to-use-environment-build-setting.patch')
| -rw-r--r-- | meta-oe/recipes-extended/redis/redis/lua-update-Makefile-to-use-environment-build-setting.patch | 47 |
1 files changed, 32 insertions, 15 deletions
diff --git a/meta-oe/recipes-extended/redis/redis/lua-update-Makefile-to-use-environment-build-setting.patch b/meta-oe/recipes-extended/redis/redis/lua-update-Makefile-to-use-environment-build-setting.patch index c4d1bc493b..7e62ae1316 100644 --- a/meta-oe/recipes-extended/redis/redis/lua-update-Makefile-to-use-environment-build-setting.patch +++ b/meta-oe/recipes-extended/redis/redis/lua-update-Makefile-to-use-environment-build-setting.patch @@ -7,14 +7,19 @@ OE-specific parameters, instead of overriding all of these simply use the ones that are already passed in. Also configure for only Linux... Signed-off-by: Venture Research <tech@ventureresearch.com> + +Updated to work with 3.0.x + +Signed-off-by: Armin Kuster <akust808@gmail.com> + --- deps/lua/src/Makefile | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) -diff --git a/deps/lua/src/Makefile b/deps/lua/src/Makefile -index 77d6a48..888d0da 100644 ---- a/deps/lua/src/Makefile -+++ b/deps/lua/src/Makefile +Index: redis-3.0.2/deps/lua/src/Makefile +=================================================================== +--- redis-3.0.2.orig/deps/lua/src/Makefile ++++ redis-3.0.2/deps/lua/src/Makefile @@ -5,18 +5,14 @@ # == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT ======================= @@ -22,7 +27,7 @@ index 77d6a48..888d0da 100644 -PLAT= none +PLAT= linux --CC= gcc +-CC?= gcc -CFLAGS= -O2 -Wall $(MYCFLAGS) -AR= ar rcu -RANLIB= ranlib @@ -40,15 +45,27 @@ index 77d6a48..888d0da 100644 # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE ========= -@@ -48,7 +44,7 @@ o: $(ALL_O) - a: $(ALL_A) +Index: redis-3.0.2/deps/Makefile +=================================================================== +--- redis-3.0.2.orig/deps/Makefile ++++ redis-3.0.2/deps/Makefile +@@ -63,7 +63,6 @@ LUA_LDFLAGS+= $(LDFLAGS) + # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more + # challenging to cross-compile lua (and redis). These defines make it easier + # to fit redis into cross-compilation environments, which typically set AR. +-AR=ar + ARFLAGS=rcu - $(LUA_A): $(CORE_O) $(LIB_O) -- $(AR) $@ $? -+ $(AR) rcu $@ $? - $(RANLIB) $@ + lua: .make-prerequisites +Index: redis-3.0.2/deps/lua/Makefile +=================================================================== +--- redis-3.0.2.orig/deps/lua/Makefile ++++ redis-3.0.2/deps/lua/Makefile +@@ -33,7 +33,6 @@ INSTALL_DATA= $(INSTALL) -m 0644 + + # Utilities. + MKDIR= mkdir -p +-RANLIB= ranlib + + # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE ========= - $(LUA_T): $(LUA_O) $(LUA_A) --- -1.8.1.2 - |