hiredis: Fix SunOS linker flags.

This commit is contained in:
jperkin 2018-01-26 09:33:31 +00:00
parent 2a95e044b0
commit ff48cd7c0a
2 changed files with 13 additions and 5 deletions

View file

@ -1,7 +1,7 @@
$NetBSD: distinfo,v 1.6 2017/07/07 11:21:12 wiz Exp $ $NetBSD: distinfo,v 1.7 2018/01/26 09:33:31 jperkin Exp $
SHA1 (hiredis-0.13.3.tar.gz) = be6f1c50fc4d649dd2924f0afecc0a1705dbe0d3 SHA1 (hiredis-0.13.3.tar.gz) = be6f1c50fc4d649dd2924f0afecc0a1705dbe0d3
RMD160 (hiredis-0.13.3.tar.gz) = 0183a5bfffa09fa51bc89667081d89c619b85037 RMD160 (hiredis-0.13.3.tar.gz) = 0183a5bfffa09fa51bc89667081d89c619b85037
SHA512 (hiredis-0.13.3.tar.gz) = 0d8b71d5ee4105e8aaeeee308795afc2c1f60a04b0bfe8ae873d800a0c157882ec307efa04a8d0e63b538fd3fc3f88eedf4d46cb87c8937e2403927aeb7e434c SHA512 (hiredis-0.13.3.tar.gz) = 0d8b71d5ee4105e8aaeeee308795afc2c1f60a04b0bfe8ae873d800a0c157882ec307efa04a8d0e63b538fd3fc3f88eedf4d46cb87c8937e2403927aeb7e434c
Size (hiredis-0.13.3.tar.gz) = 58291 bytes Size (hiredis-0.13.3.tar.gz) = 58291 bytes
SHA1 (patch-Makefile) = 28334ea2818f494061c4d663c213a01e793d7126 SHA1 (patch-Makefile) = ab9270f4dd2fe46aa39db5ca11ce51209f7cb239

View file

@ -1,10 +1,10 @@
$NetBSD: patch-Makefile,v 1.4 2017/07/07 11:21:12 wiz Exp $ $NetBSD: patch-Makefile,v 1.5 2018/01/26 09:33:31 jperkin Exp $
use libtool use libtool
--- Makefile.orig 2015-08-25 12:16:20.000000000 +0000 --- Makefile.orig 2015-09-16 10:25:02.000000000 +0000
+++ Makefile +++ Makefile
@@ -51,6 +51,7 @@ DYLIB_MAJOR_NAME=$(LIBNAME).$(DYLIBSUFFI @@ -51,13 +51,14 @@ DYLIB_MAJOR_NAME=$(LIBNAME).$(DYLIBSUFFI
DYLIBNAME=$(LIBNAME).$(DYLIBSUFFIX) DYLIBNAME=$(LIBNAME).$(DYLIBSUFFIX)
DYLIB_MAKE_CMD=$(CC) -shared -Wl,-soname,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS) DYLIB_MAKE_CMD=$(CC) -shared -Wl,-soname,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS)
STLIBNAME=$(LIBNAME).$(STLIBSUFFIX) STLIBNAME=$(LIBNAME).$(STLIBSUFFIX)
@ -12,6 +12,14 @@ use libtool
STLIB_MAKE_CMD=ar rcs $(STLIBNAME) STLIB_MAKE_CMD=ar rcs $(STLIBNAME)
# Platform-specific overrides # Platform-specific overrides
uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
ifeq ($(uname_S),SunOS)
REAL_LDFLAGS+= -ldl -lnsl -lsocket
- DYLIB_MAKE_CMD=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS)
+ DYLIB_MAKE_CMD=$(CC) -shared -o $(DYLIBNAME) -Wl,-h,$(DYLIB_MINOR_NAME) $(LDFLAGS)
INSTALL= cp -r
endif
ifeq ($(uname_S),Darwin)
@@ -66,7 +67,7 @@ ifeq ($(uname_S),Darwin) @@ -66,7 +67,7 @@ ifeq ($(uname_S),Darwin)
DYLIB_MAKE_CMD=$(CC) -shared -Wl,-install_name,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS) DYLIB_MAKE_CMD=$(CC) -shared -Wl,-install_name,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS)
endif endif