CVS commit: pkgsrc/databases/hiredis

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Jan 26 09:33:31 UTC 2018

Modified Files:
        pkgsrc/databases/hiredis: distinfo
        pkgsrc/databases/hiredis/patches: patch-Makefile

Log Message:
hiredis: Fix SunOS linker flags.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/databases/hiredis/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/hiredis/patches/patch-Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/hiredis/distinfo
diff -u pkgsrc/databases/hiredis/distinfo:1.6 pkgsrc/databases/hiredis/distinfo:1.7
--- pkgsrc/databases/hiredis/distinfo:1.6       Fri Jul  7 11:21:12 2017
+++ pkgsrc/databases/hiredis/distinfo   Fri Jan 26 09:33:31 2018
@@ -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
 RMD160 (hiredis-0.13.3.tar.gz) = 0183a5bfffa09fa51bc89667081d89c619b85037
 SHA512 (hiredis-0.13.3.tar.gz) = 0d8b71d5ee4105e8aaeeee308795afc2c1f60a04b0bfe8ae873d800a0c157882ec307efa04a8d0e63b538fd3fc3f88eedf4d46cb87c8937e2403927aeb7e434c
 Size (hiredis-0.13.3.tar.gz) = 58291 bytes
-SHA1 (patch-Makefile) = 28334ea2818f494061c4d663c213a01e793d7126
+SHA1 (patch-Makefile) = ab9270f4dd2fe46aa39db5ca11ce51209f7cb239

Index: pkgsrc/databases/hiredis/patches/patch-Makefile
diff -u pkgsrc/databases/hiredis/patches/patch-Makefile:1.4 pkgsrc/databases/hiredis/patches/patch-Makefile:1.5
--- pkgsrc/databases/hiredis/patches/patch-Makefile:1.4 Fri Jul  7 11:21:12 2017
+++ pkgsrc/databases/hiredis/patches/patch-Makefile     Fri Jan 26 09:33:31 2018
@@ -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
 
---- Makefile.orig      2015-08-25 12:16:20.000000000 +0000
+--- Makefile.orig      2015-09-16 10:25:02.000000000 +0000
 +++ Makefile
-@@ -51,6 +51,7 @@ DYLIB_MAJOR_NAME=$(LIBNAME).$(DYLIBSUFFI
+@@ -51,13 +51,14 @@ DYLIB_MAJOR_NAME=$(LIBNAME).$(DYLIBSUFFI
  DYLIBNAME=$(LIBNAME).$(DYLIBSUFFIX)
  DYLIB_MAKE_CMD=$(CC) -shared -Wl,-soname,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS)
  STLIBNAME=$(LIBNAME).$(STLIBSUFFIX)
@@ -12,6 +12,14 @@ use libtool
  STLIB_MAKE_CMD=ar rcs $(STLIBNAME)
  
  # 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)
    DYLIB_MAKE_CMD=$(CC) -shared -Wl,-install_name,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS)
  endif