diff options
| author | Sergey A. Osokin <osa@FreeBSD.org> | 2019-11-30 00:12:29 +0000 |
|---|---|---|
| committer | Sergey A. Osokin <osa@FreeBSD.org> | 2019-11-30 00:12:29 +0000 |
| commit | 9fe11803cfaf5697aefeb538f818873eae6b6215 (patch) | |
| tree | c8cd572ab0f817992ce7387227241ae736686e79 /databases/redis-devel/files/patch-src-Makefile | |
| parent | - Update to 3.1.4 (diff) | |
Update to the recent commit.
Make portlint(1) more happier by regenerating the patch and move
USES knob up.
Add another patch to respect [C|CXX]FLAGS.
Notes
Notes:
svn path=/head/; revision=518681
Diffstat (limited to 'databases/redis-devel/files/patch-src-Makefile')
| -rw-r--r-- | databases/redis-devel/files/patch-src-Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/databases/redis-devel/files/patch-src-Makefile b/databases/redis-devel/files/patch-src-Makefile index 039f8f0dbe1e..6b3ed47b68be 100644 --- a/databases/redis-devel/files/patch-src-Makefile +++ b/databases/redis-devel/files/patch-src-Makefile @@ -1,4 +1,4 @@ ---- src/Makefile.orig 2019-09-25 10:40:18 UTC +--- src/Makefile.orig 2019-11-29 16:35:59 UTC +++ src/Makefile @@ -29,7 +29,7 @@ endif WARN=-Wall -W -Wno-missing-field-initializers @@ -15,11 +15,11 @@ FINAL_LIBS=-lm -DEBUG=-g -ggdb - ifeq ($(uname_S),SunOS) - # SunOS -@@ -94,6 +93,11 @@ ifeq ($(uname_S),Darwin) - # Darwin - FINAL_LIBS+= -ldl + # Linux ARM needs -latomic at linking time + ifneq (,$(filter aarch64 armv,$(uname_M))) +@@ -105,6 +104,11 @@ ifeq ($(uname_S),Darwin) + OPENSSL_CFLAGS=-I/usr/local/opt/openssl/include + OPENSSL_LDFLAGS=-L/usr/local/opt/openssl/lib else +ifeq ($(uname_S),FreeBSD) + # FreeBSD @@ -29,7 +29,7 @@ ifeq ($(uname_S),AIX) # AIX FINAL_LDFLAGS+= -Wl,-bexpall -@@ -120,6 +124,7 @@ else +@@ -131,6 +135,7 @@ else # All the other OSes (notably Linux) FINAL_LDFLAGS+= -rdynamic FINAL_LIBS+=-ldl -pthread -lrt |