diff options
| author | Sergey A. Osokin <osa@FreeBSD.org> | 2012-08-02 18:20:11 +0000 |
|---|---|---|
| committer | Sergey A. Osokin <osa@FreeBSD.org> | 2012-08-02 18:20:11 +0000 |
| commit | 1983f961b1b785f91b0dbd54a7be073fbda9ecb9 (patch) | |
| tree | a01a2b04c030023e430a812160ca0c010c53c332 /databases/redis/files | |
| parent | Update to new upstream release v1.42.5. (diff) | |
Update from 2.4.15 to 2.4.16.
Submitted by: Kubilay Kocak aka koobs dot freebsd at gmail dot com
Tests: https://redports.org/buildarchive/20120802120704-7005/
PR: 170326
Diffstat (limited to 'databases/redis/files')
| -rw-r--r-- | databases/redis/files/patch-deps::hiredis::Makefile | 4 | ||||
| -rw-r--r-- | databases/redis/files/patch-src::Makefile | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/databases/redis/files/patch-deps::hiredis::Makefile b/databases/redis/files/patch-deps::hiredis::Makefile index b0cfcd406885..92197663ac82 100644 --- a/databases/redis/files/patch-deps::hiredis::Makefile +++ b/databases/redis/files/patch-deps::hiredis::Makefile @@ -20,8 +20,8 @@ endif +ifeq ($(uname_S),FreeBSD) + CFLAGS?=$(CFLAGS) -+ CCLINK?=-pthread -+ LDFLAGS?=-L. -Wl,-rpath,. ++ CCLINK?=$(PTHREAD_LIBS) ++ LDFLAGS?=$(LDFLAGS) + DYLIBNAME?=libhiredis.so + DYLIB_MAKE_CMD?=$(CC) -o ${DYLIBNAME} ${OBJ} + STLIBNAME?=libhiredis.a diff --git a/databases/redis/files/patch-src::Makefile b/databases/redis/files/patch-src::Makefile index fe18bb78aaba..1d51eecd7743 100644 --- a/databases/redis/files/patch-src::Makefile +++ b/databases/redis/files/patch-src::Makefile @@ -6,7 +6,7 @@ DEBUG?=-g -ggdb +else ifeq ($(uname_S),FreeBSD) + CFLAGS?= $(CFLAGS) -+ CCLINK?= -pthread -lm -L$(PREFIX)/lib -lexecinfo ++ CCLINK?= $(LDFLAGS) else CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -Wall -W $(ARCH) $(PROF) CCLINK?=-lm -pthread |