[pkgsrc/trunk]: pkgsrc/databases postgresql*: Use correct linker flags on SunOS.

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/210009909fac
branches:  trunk
changeset: 374395:210009909fac
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Mon Jan 22 11:05:29 2018 +0000

description:
postgresql*: Use correct linker flags on SunOS.

diffstat:

 databases/postgresql10/distinfo                         |   4 +-
 databases/postgresql10/patches/patch-src_Makefile.shlib |  23 ++++++++++++----
 databases/postgresql92/distinfo                         |   4 +-
 databases/postgresql92/patches/patch-src_Makefile.shlib |  15 +++++++++-
 databases/postgresql93/distinfo                         |   4 +-
 databases/postgresql93/patches/patch-src_Makefile.shlib |  19 +++++++++++--
 databases/postgresql94/distinfo                         |   4 +-
 databases/postgresql94/patches/patch-src_Makefile.shlib |  23 ++++++++++++----
 databases/postgresql95/distinfo                         |   4 +-
 databases/postgresql95/patches/patch-src_Makefile.shlib |  19 +++++++++++--
 databases/postgresql96/distinfo                         |   4 +-
 databases/postgresql96/patches/patch-src_Makefile.shlib |  23 ++++++++++++----
 12 files changed, 106 insertions(+), 40 deletions(-)

diffs (truncated from 376 to 300 lines):

diff -r 62c697ec0bde -r 210009909fac databases/postgresql10/distinfo
--- a/databases/postgresql10/distinfo   Mon Jan 22 10:35:44 2018 +0000
+++ b/databases/postgresql10/distinfo   Mon Jan 22 11:05:29 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2017/11/13 09:33:31 adam Exp $
+$NetBSD: distinfo,v 1.3 2018/01/22 11:05:29 jperkin Exp $
 
 SHA1 (postgresql-10.1.tar.bz2) = 4adcfd527ec1652ecd7a22eb71541928d3d37277
 RMD160 (postgresql-10.1.tar.bz2) = 4238ae067e5e282ee36302d596ea0654dd9e96b8
@@ -9,7 +9,7 @@
 SHA1 (patch-configure) = 59fe9a768caf8a5d308acac60c28bc6bb2c40632
 SHA1 (patch-contrib_dblink_dblink.c) = a6f87ab9f2c28a72608d70267b71bd77437b0921
 SHA1 (patch-src_Makefile.global.in) = 335b57afff23a9684ab0a09257665810c1ba2d1e
-SHA1 (patch-src_Makefile.shlib) = 46b3a8591678f92892d3837cd31fa44e8a7e21b3
+SHA1 (patch-src_Makefile.shlib) = 6363b3c7c6887c7b23295da7ebf0371e1be2d93d
 SHA1 (patch-src_backend_Makefile) = 91aa620b3a26f3da66c22aef78611a352a8793b6
 SHA1 (patch-src_backend_utils_adt_datetime.c) = d1ea70986634d3bfb663eff789425252656e1289
 SHA1 (patch-src_interfaces_ecpg_pgtypeslib_interval.c) = a15012ae34d4ecd1eb2bc29e4d2c40098ea236fd
diff -r 62c697ec0bde -r 210009909fac databases/postgresql10/patches/patch-src_Makefile.shlib
--- a/databases/postgresql10/patches/patch-src_Makefile.shlib   Mon Jan 22 10:35:44 2018 +0000
+++ b/databases/postgresql10/patches/patch-src_Makefile.shlib   Mon Jan 22 11:05:29 2018 +0000
@@ -1,8 +1,10 @@
-$NetBSD: patch-src_Makefile.shlib,v 1.1 2017/10/23 20:33:49 adam Exp $
+$NetBSD: patch-src_Makefile.shlib,v 1.2 2018/01/22 11:05:29 jperkin Exp $
+
+Use correct linker flags.
 
---- src/Makefile.shlib.orig    2016-02-08 21:12:28.000000000 +0000
+--- src/Makefile.shlib.orig    2017-11-07 00:46:52.000000000 +0000
 +++ src/Makefile.shlib
-@@ -151,17 +151,11 @@ endif
+@@ -150,17 +150,11 @@ endif
  
  ifeq ($(PORTNAME), freebsd)
    ifdef ELF_SYSTEM
@@ -20,7 +22,7 @@
      LINK.shared               = $(LD) -x -Bshareable -Bforcearchive
    endif
  endif
-@@ -177,6 +171,17 @@ ifeq ($(PORTNAME), netbsd)
+@@ -176,6 +170,17 @@ ifeq ($(PORTNAME), netbsd)
    endif
  endif
  
@@ -38,7 +40,16 @@
  ifeq ($(PORTNAME), hpux)
    ifdef SO_MAJOR_VERSION
      shlib                     = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
-@@ -474,8 +479,10 @@ ifdef soname
+@@ -231,7 +236,7 @@ ifeq ($(PORTNAME), solaris)
+     ifeq ($(with_gnu_ld), yes)
+       LINK.shared     += -Wl,-soname,$(soname)
+     else
+-      LINK.shared     += -h $(soname)
++      LINK.shared     += -Wl,-h,$(soname)
+     endif
+   endif
+ endif
+@@ -450,8 +455,10 @@ ifdef soname
  # we don't install $(shlib) on AIX
  # (see http://archives.postgresql.org/message-id/52EF20B2E3209443BC37736D00C3C1380A6E79FE%EXADV1.host.magwien.gv.at@localhost)
  ifneq ($(PORTNAME), aix)
@@ -50,7 +61,7 @@
  ifneq ($(PORTNAME), win32)
  ifneq ($(shlib), $(shlib_major))
        cd '$(DESTDIR)$(libdir)' && \
-@@ -488,7 +495,7 @@ ifneq ($(shlib), $(shlib_bare))
+@@ -464,7 +471,7 @@ ifneq ($(shlib), $(shlib_bare))
        $(LN_S) $(shlib) $(shlib_bare)
  endif
  endif # not win32
diff -r 62c697ec0bde -r 210009909fac databases/postgresql92/distinfo
--- a/databases/postgresql92/distinfo   Mon Jan 22 10:35:44 2018 +0000
+++ b/databases/postgresql92/distinfo   Mon Jan 22 11:05:29 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2017/11/13 09:33:31 adam Exp $
+$NetBSD: distinfo,v 1.27 2018/01/22 11:05:29 jperkin Exp $
 
 SHA1 (postgresql-9.2.24.tar.bz2) = 63d6966ccdbab6aae1f9754fdb8e341ada1ef653
 RMD160 (postgresql-9.2.24.tar.bz2) = 2fc1b9c37cfefd5fae5bd02f974484c5fc680c08
@@ -9,7 +9,7 @@
 SHA1 (patch-configure) = 21b27add570cff1a24c440201eb1ed49f8223747
 SHA1 (patch-contrib_dblink_Makefile) = 4960ad57d42465fae203870548e4c53f8a32ce04
 SHA1 (patch-contrib_dblink_dblink.c) = 245ce06df88837ba88142aea1d0ba787d65ddb45
-SHA1 (patch-src_Makefile.shlib) = fedf35f38439a724fa6522e1aaef110c9909866a
+SHA1 (patch-src_Makefile.shlib) = b78433e03e8bc151fa837c3812f0ca5f00709c6f
 SHA1 (patch-src_backend_Makefile) = 76ddd3015d93b19cdd6000eaffc4f53cbd4965b5
 SHA1 (patch-src_backend_utils_adt_datetime.c) = b220c39272bf8d2bda95119adcbab5b2495990d8
 SHA1 (patch-src_interfaces_ecpg_pgtypeslib_interval.c) = 20578ab950465db07dab757db2fae4c4570cbbe1
diff -r 62c697ec0bde -r 210009909fac databases/postgresql92/patches/patch-src_Makefile.shlib
--- a/databases/postgresql92/patches/patch-src_Makefile.shlib   Mon Jan 22 10:35:44 2018 +0000
+++ b/databases/postgresql92/patches/patch-src_Makefile.shlib   Mon Jan 22 11:05:29 2018 +0000
@@ -1,6 +1,8 @@
-$NetBSD: patch-src_Makefile.shlib,v 1.1 2012/10/05 21:03:10 adam Exp $
+$NetBSD: patch-src_Makefile.shlib,v 1.2 2018/01/22 11:05:29 jperkin Exp $
 
---- src/Makefile.shlib.orig    2012-09-19 21:47:58.000000000 +0000
+Use correct linker flags.
+
+--- src/Makefile.shlib.orig    2017-11-06 22:17:39.000000000 +0000
 +++ src/Makefile.shlib
 @@ -159,17 +159,11 @@ endif
  
@@ -38,3 +40,12 @@
  ifeq ($(PORTNAME), hpux)
    ifdef SO_MAJOR_VERSION
      shlib                     = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
+@@ -250,7 +255,7 @@ ifeq ($(PORTNAME), solaris)
+     ifeq ($(with_gnu_ld), yes)
+       LINK.shared     += -Wl,-soname,$(soname)
+     else
+-      LINK.shared     += -h $(soname)
++      LINK.shared     += -Wl,-h,$(soname)
+     endif
+   endif
+ endif
diff -r 62c697ec0bde -r 210009909fac databases/postgresql93/distinfo
--- a/databases/postgresql93/distinfo   Mon Jan 22 10:35:44 2018 +0000
+++ b/databases/postgresql93/distinfo   Mon Jan 22 11:05:29 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2017/11/13 09:33:31 adam Exp $
+$NetBSD: distinfo,v 1.27 2018/01/22 11:05:29 jperkin Exp $
 
 SHA1 (postgresql-9.3.20.tar.bz2) = c42716dc68db04822f5454b75f884631d2830ed2
 RMD160 (postgresql-9.3.20.tar.bz2) = 2b19fce50fb1ebecc548d2da6e8e47ad08350353
@@ -11,7 +11,7 @@
 SHA1 (patch-contrib_dblink_dblink.c) = a6f87ab9f2c28a72608d70267b71bd77437b0921
 SHA1 (patch-contrib_postgres__fdw_Makefile) = 07feda488e3acb71405b04d0d745c9920456b32b
 SHA1 (patch-src_Makefile.global.in) = 53e29e000d7fb71e2625aacd32324e9d7001b5b2
-SHA1 (patch-src_Makefile.shlib) = 69f980184fd8dbd821221a1c6ac3a88408f2c4cf
+SHA1 (patch-src_Makefile.shlib) = de915e0c66efccddfc54876ea6fa57d04e6b2593
 SHA1 (patch-src_backend_Makefile) = deba6bc07ba2e4b8ef8f04f20efb2bdd54cb917e
 SHA1 (patch-src_backend_utils_adt_datetime.c) = cb404b369b39f7e55765a490f8448b870f237511
 SHA1 (patch-src_interfaces_ecpg_pgtypeslib_interval.c) = 98a49b9fc6677c4c930b574249f015727391938c
diff -r 62c697ec0bde -r 210009909fac databases/postgresql93/patches/patch-src_Makefile.shlib
--- a/databases/postgresql93/patches/patch-src_Makefile.shlib   Mon Jan 22 10:35:44 2018 +0000
+++ b/databases/postgresql93/patches/patch-src_Makefile.shlib   Mon Jan 22 11:05:29 2018 +0000
@@ -1,6 +1,8 @@
-$NetBSD: patch-src_Makefile.shlib,v 1.3 2014/02/23 11:25:54 adam Exp $
+$NetBSD: patch-src_Makefile.shlib,v 1.4 2018/01/22 11:05:29 jperkin Exp $
 
---- src/Makefile.shlib.orig    2013-09-02 20:53:17.000000000 +0000
+Use correct linker flags.
+
+--- src/Makefile.shlib.orig    2017-11-06 22:15:48.000000000 +0000
 +++ src/Makefile.shlib
 @@ -156,17 +156,11 @@ endif
  
@@ -38,7 +40,16 @@
  ifeq ($(PORTNAME), hpux)
    ifdef SO_MAJOR_VERSION
      shlib                     = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
-@@ -467,8 +480,10 @@ ifdef soname
+@@ -247,7 +252,7 @@ ifeq ($(PORTNAME), solaris)
+     ifeq ($(with_gnu_ld), yes)
+       LINK.shared     += -Wl,-soname,$(soname)
+     else
+-      LINK.shared     += -h $(soname)
++      LINK.shared     += -Wl,-h,$(soname)
+     endif
+   endif
+ endif
+@@ -491,8 +496,10 @@ ifdef soname
  # we don't install $(shlib) on AIX
  # (see http://archives.postgresql.org/message-id/52EF20B2E3209443BC37736D00C3C1380A6E79FE%EXADV1.host.magwien.gv.at@localhost)
  ifneq ($(PORTNAME), aix)
@@ -50,7 +61,7 @@
  ifneq ($(PORTNAME), win32)
  ifneq ($(shlib), $(shlib_major))
        cd '$(DESTDIR)$(libdir)' && \
-@@ -481,7 +496,7 @@ ifneq ($(shlib), $(shlib_bare))
+@@ -505,7 +512,7 @@ ifneq ($(shlib), $(shlib_bare))
        $(LN_S) $(shlib) $(shlib_bare)
  endif
  endif # not win32
diff -r 62c697ec0bde -r 210009909fac databases/postgresql94/distinfo
--- a/databases/postgresql94/distinfo   Mon Jan 22 10:35:44 2018 +0000
+++ b/databases/postgresql94/distinfo   Mon Jan 22 11:05:29 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2017/11/13 09:33:32 adam Exp $
+$NetBSD: distinfo,v 1.19 2018/01/22 11:05:29 jperkin Exp $
 
 SHA1 (postgresql-9.4.15.tar.bz2) = 5e50e5c0a66c676c584a41b25f18e326781aecdb
 RMD160 (postgresql-9.4.15.tar.bz2) = 04dc5296bca61d8d1e32fa95b2002f36f9effc8f
@@ -10,7 +10,7 @@
 SHA1 (patch-contrib_dblink_dblink.c) = a6f87ab9f2c28a72608d70267b71bd77437b0921
 SHA1 (patch-contrib_uuid-ossp_uuid-ossp.c) = b18da04850bc7c14f8fc80e0c86429ed1cc075c8
 SHA1 (patch-src_Makefile.global.in) = 2ab3affedc77b202f6749964287438d6179ca23a
-SHA1 (patch-src_Makefile.shlib) = 69f980184fd8dbd821221a1c6ac3a88408f2c4cf
+SHA1 (patch-src_Makefile.shlib) = 62533bab4807033780732dfbea7e37d618807b37
 SHA1 (patch-src_backend_Makefile) = b70b38ea23af6cdde9d2349f2441a429078cfaca
 SHA1 (patch-src_backend_utils_adt_datetime.c) = d1ea70986634d3bfb663eff789425252656e1289
 SHA1 (patch-src_interfaces_ecpg_pgtypeslib_interval.c) = af0971de415b6b44ae3520cfc9bd6ffd5dcdeb62
diff -r 62c697ec0bde -r 210009909fac databases/postgresql94/patches/patch-src_Makefile.shlib
--- a/databases/postgresql94/patches/patch-src_Makefile.shlib   Mon Jan 22 10:35:44 2018 +0000
+++ b/databases/postgresql94/patches/patch-src_Makefile.shlib   Mon Jan 22 11:05:29 2018 +0000
@@ -1,8 +1,10 @@
-$NetBSD: patch-src_Makefile.shlib,v 1.1 2015/01/14 21:01:18 adam Exp $
+$NetBSD: patch-src_Makefile.shlib,v 1.2 2018/01/22 11:05:30 jperkin Exp $
+
+Use correct linker flags.
 
---- src/Makefile.shlib.orig    2013-09-02 20:53:17.000000000 +0000
+--- src/Makefile.shlib.orig    2017-11-06 22:13:17.000000000 +0000
 +++ src/Makefile.shlib
-@@ -156,17 +156,11 @@ endif
+@@ -150,17 +150,11 @@ endif
  
  ifeq ($(PORTNAME), freebsd)
    ifdef ELF_SYSTEM
@@ -20,7 +22,7 @@
      LINK.shared               = $(LD) -x -Bshareable -Bforcearchive
    endif
  endif
-@@ -182,6 +176,17 @@ ifeq ($(PORTNAME), netbsd)
+@@ -176,6 +170,17 @@ ifeq ($(PORTNAME), netbsd)
    endif
  endif
  
@@ -38,7 +40,16 @@
  ifeq ($(PORTNAME), hpux)
    ifdef SO_MAJOR_VERSION
      shlib                     = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
-@@ -467,8 +480,10 @@ ifdef soname
+@@ -231,7 +236,7 @@ ifeq ($(PORTNAME), solaris)
+     ifeq ($(with_gnu_ld), yes)
+       LINK.shared     += -Wl,-soname,$(soname)
+     else
+-      LINK.shared     += -h $(soname)
++      LINK.shared     += -Wl,-h,$(soname)
+     endif
+   endif
+ endif
+@@ -486,8 +491,10 @@ ifdef soname
  # we don't install $(shlib) on AIX
  # (see http://archives.postgresql.org/message-id/52EF20B2E3209443BC37736D00C3C1380A6E79FE%EXADV1.host.magwien.gv.at@localhost)
  ifneq ($(PORTNAME), aix)
@@ -50,7 +61,7 @@
  ifneq ($(PORTNAME), win32)
  ifneq ($(shlib), $(shlib_major))
        cd '$(DESTDIR)$(libdir)' && \
-@@ -481,7 +496,7 @@ ifneq ($(shlib), $(shlib_bare))
+@@ -500,7 +507,7 @@ ifneq ($(shlib), $(shlib_bare))
        $(LN_S) $(shlib) $(shlib_bare)
  endif
  endif # not win32
diff -r 62c697ec0bde -r 210009909fac databases/postgresql95/distinfo
--- a/databases/postgresql95/distinfo   Mon Jan 22 10:35:44 2018 +0000
+++ b/databases/postgresql95/distinfo   Mon Jan 22 11:05:29 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2017/11/13 09:33:32 adam Exp $
+$NetBSD: distinfo,v 1.12 2018/01/22 11:05:30 jperkin Exp $
 
 SHA1 (postgresql-9.5.10.tar.bz2) = dd0c5905ffc122cede63727c39077f185ee4bde5
 RMD160 (postgresql-9.5.10.tar.bz2) = d5f557708cacf75788fea9e89c848568b1c4289e
@@ -9,7 +9,7 @@
 SHA1 (patch-configure) = 59fe9a768caf8a5d308acac60c28bc6bb2c40632
 SHA1 (patch-contrib_dblink_dblink.c) = a6f87ab9f2c28a72608d70267b71bd77437b0921
 SHA1 (patch-src_Makefile.global.in) = 2ab3affedc77b202f6749964287438d6179ca23a
-SHA1 (patch-src_Makefile.shlib) = 46b3a8591678f92892d3837cd31fa44e8a7e21b3
+SHA1 (patch-src_Makefile.shlib) = a809ef756e9314723476fe7408a97d23f83a0311
 SHA1 (patch-src_backend_Makefile) = b70b38ea23af6cdde9d2349f2441a429078cfaca
 SHA1 (patch-src_backend_utils_adt_datetime.c) = d1ea70986634d3bfb663eff789425252656e1289
 SHA1 (patch-src_interfaces_ecpg_pgtypeslib_interval.c) = a15012ae34d4ecd1eb2bc29e4d2c40098ea236fd
diff -r 62c697ec0bde -r 210009909fac databases/postgresql95/patches/patch-src_Makefile.shlib
--- a/databases/postgresql95/patches/patch-src_Makefile.shlib   Mon Jan 22 10:35:44 2018 +0000
+++ b/databases/postgresql95/patches/patch-src_Makefile.shlib   Mon Jan 22 11:05:29 2018 +0000
@@ -1,6 +1,8 @@
-$NetBSD: patch-src_Makefile.shlib,v 1.1 2016/02/25 21:37:35 tnn Exp $
+$NetBSD: patch-src_Makefile.shlib,v 1.2 2018/01/22 11:05:30 jperkin Exp $
 
---- src/Makefile.shlib.orig    2016-02-08 21:12:28.000000000 +0000
+Use correct linker flags.
+
+--- src/Makefile.shlib.orig    2017-11-06 22:11:00.000000000 +0000
 +++ src/Makefile.shlib
 @@ -151,17 +151,11 @@ endif
  
@@ -38,7 +40,16 @@
  ifeq ($(PORTNAME), hpux)
    ifdef SO_MAJOR_VERSION
      shlib                     = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
-@@ -474,8 +479,10 @@ ifdef soname
+@@ -232,7 +237,7 @@ ifeq ($(PORTNAME), solaris)
+     ifeq ($(with_gnu_ld), yes)
+       LINK.shared     += -Wl,-soname,$(soname)
+     else
+-      LINK.shared     += -h $(soname)
++      LINK.shared     += -Wl,-h,$(soname)
+     endif
+   endif
+ endif
+@@ -483,8 +488,10 @@ ifdef soname
  # we don't install $(shlib) on AIX
  # (see http://archives.postgresql.org/message-id/52EF20B2E3209443BC37736D00C3C1380A6E79FE%EXADV1.host.magwien.gv.at@localhost)
  ifneq ($(PORTNAME), aix)
@@ -50,7 +61,7 @@
  ifneq ($(PORTNAME), win32)
  ifneq ($(shlib), $(shlib_major))
        cd '$(DESTDIR)$(libdir)' && \