[pkgsrc/trunk]: pkgsrc/databases Make sure the --as-needed linker arg does no...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/databases Make sure the --as-needed linker arg does no...
From: fhajny <fhajny%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 08:15:48 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/d71a29383534
branches:  trunk
changeset: 371401:d71a29383534
user:      fhajny <fhajny%pkgsrc.org@localhost>
date:      Fri Nov 10 14:47:41 2017 +0000

description:
Make sure the --as-needed linker arg does not leak into the pgxs Makefiles
on Darwin and SunOS where it's not supported. Bump PKGREVISION on *-client.

diffstat:

 databases/postgresql10-client/Makefile |   3 ++-
 databases/postgresql10/Makefile.common |  10 +++++++++-
 databases/postgresql92-client/Makefile |   3 ++-
 databases/postgresql92/Makefile.common |  10 +++++++++-
 databases/postgresql93-client/Makefile |   3 ++-
 databases/postgresql93/Makefile.common |  10 +++++++++-
 databases/postgresql94-client/Makefile |   4 ++--
 databases/postgresql94/Makefile.common |  10 +++++++++-
 databases/postgresql95-client/Makefile |   3 ++-
 databases/postgresql95/Makefile.common |  10 +++++++++-
 databases/postgresql96-client/Makefile |   3 ++-
 databases/postgresql96/Makefile.common |  10 +++++++++-
 12 files changed, 66 insertions(+), 13 deletions(-)

diffs (217 lines):

diff -r 0e414c824c80 -r d71a29383534 databases/postgresql10-client/Makefile
--- a/databases/postgresql10-client/Makefile    Fri Nov 10 11:22:02 2017 +0000
+++ b/databases/postgresql10-client/Makefile    Fri Nov 10 14:47:41 2017 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2017/10/23 20:33:49 adam Exp $
+# $NetBSD: Makefile,v 1.2 2017/11/10 14:47:41 fhajny Exp $
 
 PKGNAME=       ${DISTNAME:C/-/10-client-/}
+PKGREVISION=   1
 COMMENT=       PostgreSQL database client programs
 
 .include "../../databases/postgresql10/Makefile.common"
diff -r 0e414c824c80 -r d71a29383534 databases/postgresql10/Makefile.common
--- a/databases/postgresql10/Makefile.common    Fri Nov 10 11:22:02 2017 +0000
+++ b/databases/postgresql10/Makefile.common    Fri Nov 10 14:47:41 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2017/10/23 20:33:49 adam Exp $
+# $NetBSD: Makefile.common,v 1.2 2017/11/10 14:47:41 fhajny Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -79,6 +79,14 @@
 CONFIGURE_ENV+=                ac_cv_header_sys_ucred_h=no
 .endif
 
+# pkgsrc silently filters the --as-needed linker arg, but that makes
+# it leak into the pgxs Makefiles and compromises manual building
+# against PostgreSQL files installed. Disable it here to prevent
+# that from happening.
+.if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin"
+CONFIGURE_ENV+=                pgac_cv_prog_cc_ldflags__Wl___as_needed=no
+.endif
+
 # configure fails on OpenBSD and MirBSD if thread safety is enabled.
 .if ${OPSYS} == "OpenBSD" || ${OPSYS} == "MirBSD"
 CONFIGURE_ARGS+=       --disable-thread-safety
diff -r 0e414c824c80 -r d71a29383534 databases/postgresql92-client/Makefile
--- a/databases/postgresql92-client/Makefile    Fri Nov 10 11:22:02 2017 +0000
+++ b/databases/postgresql92-client/Makefile    Fri Nov 10 14:47:41 2017 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2016/04/09 12:51:46 adam Exp $
+# $NetBSD: Makefile,v 1.10 2017/11/10 14:47:41 fhajny Exp $
 
 PKGNAME=       ${DISTNAME:C/-/92-client-/}
+PKGREVISION=   1
 COMMENT=       PostgreSQL database client programs
 
 .include "../../databases/postgresql92/Makefile.common"
diff -r 0e414c824c80 -r d71a29383534 databases/postgresql92/Makefile.common
--- a/databases/postgresql92/Makefile.common    Fri Nov 10 11:22:02 2017 +0000
+++ b/databases/postgresql92/Makefile.common    Fri Nov 10 14:47:41 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.31 2017/09/04 19:33:43 adam Exp $
+# $NetBSD: Makefile.common,v 1.32 2017/11/10 14:47:41 fhajny Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -76,6 +76,14 @@
 # procfs and largefile.
 CONFIGURE_ENV.SunOS+=  ac_cv_header_sys_ucred_h=no
 
+# pkgsrc silently filters the --as-needed linker arg, but that makes
+# it leak into the pgxs Makefiles and compromises manual building
+# against PostgreSQL files installed. Disable it here to prevent
+# that from happening.
+.if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin"
+CONFIGURE_ENV+=                pgac_cv_prog_cc_ldflags__Wl___as_needed=no
+.endif
+
 # configure fails on OpenBSD and MirBSD if thread safety is enabled.
 CONFIGURE_ARGS.MirBSD+=                --disable-thread-safety
 CONFIGURE_ARGS.OpenBSD+=       --disable-thread-safety
diff -r 0e414c824c80 -r d71a29383534 databases/postgresql93-client/Makefile
--- a/databases/postgresql93-client/Makefile    Fri Nov 10 11:22:02 2017 +0000
+++ b/databases/postgresql93-client/Makefile    Fri Nov 10 14:47:41 2017 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2016/08/23 06:28:16 adam Exp $
+# $NetBSD: Makefile,v 1.12 2017/11/10 14:47:41 fhajny Exp $
 
 PKGNAME=       ${DISTNAME:C/-/93-client-/}
+PKGREVISION=   1
 COMMENT=       PostgreSQL database client programs
 
 .include "../../databases/postgresql93/Makefile.common"
diff -r 0e414c824c80 -r d71a29383534 databases/postgresql93/Makefile.common
--- a/databases/postgresql93/Makefile.common    Fri Nov 10 11:22:02 2017 +0000
+++ b/databases/postgresql93/Makefile.common    Fri Nov 10 14:47:41 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.27 2017/09/04 19:33:43 adam Exp $
+# $NetBSD: Makefile.common,v 1.28 2017/11/10 14:47:41 fhajny Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -75,6 +75,14 @@
 # procfs and largefile.
 CONFIGURE_ENV.SunOS+=  ac_cv_header_sys_ucred_h=no
 
+# pkgsrc silently filters the --as-needed linker arg, but that makes
+# it leak into the pgxs Makefiles and compromises manual building
+# against PostgreSQL files installed. Disable it here to prevent
+# that from happening.
+.if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin"
+CONFIGURE_ENV+=                pgac_cv_prog_cc_ldflags__Wl___as_needed=no
+.endif
+
 # configure fails on OpenBSD and MirBSD if thread safety is enabled.
 CONFIGURE_ARGS.MirBSD+=                --disable-thread-safety
 CONFIGURE_ARGS.OpenBSD+=       --disable-thread-safety
diff -r 0e414c824c80 -r d71a29383534 databases/postgresql94-client/Makefile
--- a/databases/postgresql94-client/Makefile    Fri Nov 10 11:22:02 2017 +0000
+++ b/databases/postgresql94-client/Makefile    Fri Nov 10 14:47:41 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2016/08/14 16:56:30 is Exp $
+# $NetBSD: Makefile,v 1.6 2017/11/10 14:47:42 fhajny Exp $
 
 PKGNAME=       ${DISTNAME:C/-/94-client-/}
-PKGREVISION=   #
+PKGREVISION=   1
 COMMENT=       PostgreSQL database client programs
 
 .include "../../databases/postgresql94/Makefile.common"
diff -r 0e414c824c80 -r d71a29383534 databases/postgresql94/Makefile.common
--- a/databases/postgresql94/Makefile.common    Fri Nov 10 11:22:02 2017 +0000
+++ b/databases/postgresql94/Makefile.common    Fri Nov 10 14:47:41 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2017/09/04 19:33:43 adam Exp $
+# $NetBSD: Makefile.common,v 1.20 2017/11/10 14:47:41 fhajny Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -75,6 +75,14 @@
 # procfs and largefile.
 CONFIGURE_ENV.SunOS+=  ac_cv_header_sys_ucred_h=no
 
+# pkgsrc silently filters the --as-needed linker arg, but that makes
+# it leak into the pgxs Makefiles and compromises manual building
+# against PostgreSQL files installed. Disable it here to prevent
+# that from happening.
+.if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin"
+CONFIGURE_ENV+=                pgac_cv_prog_cc_ldflags__Wl___as_needed=no
+.endif
+
 # configure fails on OpenBSD and MirBSD if thread safety is enabled.
 CONFIGURE_ARGS.MirBSD+=                --disable-thread-safety
 CONFIGURE_ARGS.OpenBSD+=       --disable-thread-safety
diff -r 0e414c824c80 -r d71a29383534 databases/postgresql95-client/Makefile
--- a/databases/postgresql95-client/Makefile    Fri Nov 10 11:22:02 2017 +0000
+++ b/databases/postgresql95-client/Makefile    Fri Nov 10 14:47:41 2017 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2017/08/13 19:25:18 adam Exp $
+# $NetBSD: Makefile,v 1.6 2017/11/10 14:47:42 fhajny Exp $
 
 PKGNAME=       ${DISTNAME:C/-/95-client-/}
+PKGREVISION=   1
 COMMENT=       PostgreSQL database client programs
 
 .include "../../databases/postgresql95/Makefile.common"
diff -r 0e414c824c80 -r d71a29383534 databases/postgresql95/Makefile.common
--- a/databases/postgresql95/Makefile.common    Fri Nov 10 11:22:02 2017 +0000
+++ b/databases/postgresql95/Makefile.common    Fri Nov 10 14:47:41 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2017/09/04 19:33:43 adam Exp $
+# $NetBSD: Makefile.common,v 1.13 2017/11/10 14:47:41 fhajny Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -77,6 +77,14 @@
 CONFIGURE_ENV+=                ac_cv_header_sys_ucred_h=no
 .endif
 
+# pkgsrc silently filters the --as-needed linker arg, but that makes
+# it leak into the pgxs Makefiles and compromises manual building
+# against PostgreSQL files installed. Disable it here to prevent
+# that from happening.
+.if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin"
+CONFIGURE_ENV+=                pgac_cv_prog_cc_ldflags__Wl___as_needed=no
+.endif
+
 # configure fails on OpenBSD and MirBSD if thread safety is enabled.
 .if ${OPSYS} == "OpenBSD" || ${OPSYS} == "MirBSD"
 CONFIGURE_ARGS+=       --disable-thread-safety
diff -r 0e414c824c80 -r d71a29383534 databases/postgresql96-client/Makefile
--- a/databases/postgresql96-client/Makefile    Fri Nov 10 11:22:02 2017 +0000
+++ b/databases/postgresql96-client/Makefile    Fri Nov 10 14:47:41 2017 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2017/08/13 19:25:18 adam Exp $
+# $NetBSD: Makefile,v 1.4 2017/11/10 14:47:42 fhajny Exp $
 
 PKGNAME=       ${DISTNAME:C/-/96-client-/}
+PKGREVISION=   1
 COMMENT=       PostgreSQL database client programs
 
 .include "../../databases/postgresql96/Makefile.common"
diff -r 0e414c824c80 -r d71a29383534 databases/postgresql96/Makefile.common
--- a/databases/postgresql96/Makefile.common    Fri Nov 10 11:22:02 2017 +0000
+++ b/databases/postgresql96/Makefile.common    Fri Nov 10 14:47:41 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2017/09/04 19:33:43 adam Exp $
+# $NetBSD: Makefile.common,v 1.7 2017/11/10 14:47:41 fhajny Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -77,6 +77,14 @@
 CONFIGURE_ENV+=                ac_cv_header_sys_ucred_h=no
 .endif
 
+# pkgsrc silently filters the --as-needed linker arg, but that makes
+# it leak into the pgxs Makefiles and compromises manual building
+# against PostgreSQL files installed. Disable it here to prevent
+# that from happening.
+.if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin"
+CONFIGURE_ENV+=                pgac_cv_prog_cc_ldflags__Wl___as_needed=no
+.endif
+
 # configure fails on OpenBSD and MirBSD if thread safety is enabled.
 .if ${OPSYS} == "OpenBSD" || ${OPSYS} == "MirBSD"
 CONFIGURE_ARGS+=       --disable-thread-safety
Prev by Date: [pkgsrc/trunk]: pkgsrc/databases/postgresql-redislog Import redislog-0.2 as d...
Next by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Added databases/postgresql-redislog version 0.2
Previous by Thread: [pkgsrc/trunk]: pkgsrc/databases/postgresql-redislog Import redislog-0.2 as d...
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Added databases/postgresql-redislog version 0.2
Indexes:
Home | Main Index | Thread Index | Old Index