diff options
| author |   Luca Barbato <lu_zero@gentoo.org> | 2011-08-14 12:32:55 +0000 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2011-08-14 12:32:55 +0000 |
| commit | 9174db85e6ac397c78f5344766ed21aafb48dd28 (patch) | |
| tree | 2aa42f88713f84e0de06c5544463ba0644d3b46c /dev-db/redis/files | |
| parent | Bump to 1.2.24 (diff) | |
| download | gentoo-2-9174db85e6ac397c78f5344766ed21aafb48dd28.tar.gz gentoo-2-9174db85e6ac397c78f5344766ed21aafb48dd28.tar.bz2 gentoo-2-9174db85e6ac397c78f5344766ed21aafb48dd28.zip | |
New version
(Portage version: 2.1.10.10/cvs/Linux x86_64)
Diffstat (limited to 'dev-db/redis/files')
| -rw-r--r-- | dev-db/redis/files/redis-2.2-as-needed.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/dev-db/redis/files/redis-2.2-as-needed.patch b/dev-db/redis/files/redis-2.2-as-needed.patch new file mode 100644 index 000000000000..d40cf0dbae6c --- /dev/null +++ b/dev-db/redis/files/redis-2.2-as-needed.patch @@ -0,0 +1,53 @@ +From e1f01c9b28751d71ba0df682fb0f6b62f4db9191 Mon Sep 17 00:00:00 2001 +From: Pieter Noordhuis <pcnoordhuis@gmail.com> +Date: Thu, 28 Jul 2011 10:38:11 +0200 +Subject: [PATCH] Fix link order for ld --as-needed (thanks to Nigel Babu) + +--- + src/Makefile | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index 67b0972..f2bbfac 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -32,7 +32,7 @@ ifeq ($(USE_TCMALLOC),yes) + CCLINK+= -ltcmalloc + CFLAGS+= -DUSE_TCMALLOC + endif +-CCOPT= $(CFLAGS) $(CCLINK) $(ARCH) $(PROF) ++CCOPT= $(CFLAGS) $(ARCH) $(PROF) + + PREFIX= /usr/local + INSTALL_BIN= $(PREFIX)/bin +@@ -130,12 +130,12 @@ dependencies: + cd ../deps/linenoise && $(MAKE) ARCH="$(ARCH)" + + redis-server: $(OBJ) +- $(QUIET_LINK)$(CC) -o $(PRGNAME) $(CCOPT) $(DEBUG) $(OBJ) ++ $(QUIET_LINK)$(CC) -o $(PRGNAME) $(CCOPT) $(DEBUG) $(OBJ) $(CCLINK) + + redis-benchmark: dependencies $(BENCHOBJ) + @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)hiredis$(ENDCOLOR) + cd ../deps/hiredis && $(MAKE) static ARCH="$(ARCH)" +- $(QUIET_LINK)$(CC) -o $(BENCHPRGNAME) $(CCOPT) $(DEBUG) $(BENCHOBJ) ../deps/hiredis/libhiredis.a ++ $(QUIET_LINK)$(CC) -o $(BENCHPRGNAME) $(CCOPT) $(DEBUG) $(BENCHOBJ) ../deps/hiredis/libhiredis.a $(CCLINK) + + redis-benchmark.o: + $(QUIET_CC)$(CC) -c $(CFLAGS) -I../deps/hiredis $(DEBUG) $(COMPILE_TIME) $< +@@ -147,10 +147,10 @@ redis-cli.o: + $(QUIET_CC)$(CC) -c $(CFLAGS) -I../deps/hiredis -I../deps/linenoise $(DEBUG) $(COMPILE_TIME) $< + + redis-check-dump: $(CHECKDUMPOBJ) +- $(QUIET_LINK)$(CC) -o $(CHECKDUMPPRGNAME) $(CCOPT) $(DEBUG) $(CHECKDUMPOBJ) ++ $(QUIET_LINK)$(CC) -o $(CHECKDUMPPRGNAME) $(CCOPT) $(DEBUG) $(CHECKDUMPOBJ) $(CCLINK) + + redis-check-aof: $(CHECKAOFOBJ) +- $(QUIET_LINK)$(CC) -o $(CHECKAOFPRGNAME) $(CCOPT) $(DEBUG) $(CHECKAOFOBJ) ++ $(QUIET_LINK)$(CC) -o $(CHECKAOFPRGNAME) $(CCOPT) $(DEBUG) $(CHECKAOFOBJ) $(CCLINK) + + .c.o: + $(QUIET_CC)$(CC) -c $(CFLAGS) $(DEBUG) $(COMPILE_TIME) $< +-- +1.7.6 + |