diff options
author | fhajny <fhajny@pkgsrc.org> | 2017-11-10 14:47:41 +0000 |
---|---|---|
committer | fhajny <fhajny@pkgsrc.org> | 2017-11-10 14:47:41 +0000 |
commit | 391a158fd1dfa4174fda64881682717c5523c9c6 (patch) | |
tree | 7658334b95e417c8a81026469b20567705b9d774 /databases | |
parent | 14827bee44377938a3e6592143af0016226ff1e5 (diff) | |
download | pkgsrc-391a158fd1dfa4174fda64881682717c5523c9c6.tar.gz |
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 (limited to 'databases')
-rw-r--r-- | databases/postgresql10-client/Makefile | 3 | ||||
-rw-r--r-- | databases/postgresql10/Makefile.common | 10 | ||||
-rw-r--r-- | databases/postgresql92-client/Makefile | 3 | ||||
-rw-r--r-- | databases/postgresql92/Makefile.common | 10 | ||||
-rw-r--r-- | databases/postgresql93-client/Makefile | 3 | ||||
-rw-r--r-- | databases/postgresql93/Makefile.common | 10 | ||||
-rw-r--r-- | databases/postgresql94-client/Makefile | 4 | ||||
-rw-r--r-- | databases/postgresql94/Makefile.common | 10 | ||||
-rw-r--r-- | databases/postgresql95-client/Makefile | 3 | ||||
-rw-r--r-- | databases/postgresql95/Makefile.common | 10 | ||||
-rw-r--r-- | databases/postgresql96-client/Makefile | 3 | ||||
-rw-r--r-- | databases/postgresql96/Makefile.common | 10 |
12 files changed, 66 insertions, 13 deletions
diff --git a/databases/postgresql10-client/Makefile b/databases/postgresql10-client/Makefile index 7c5461a2963..72c189b2d4b 100644 --- a/databases/postgresql10-client/Makefile +++ b/databases/postgresql10-client/Makefile @@ -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 --git a/databases/postgresql10/Makefile.common b/databases/postgresql10/Makefile.common index 53f43c0c6ba..b11554590e3 100644 --- a/databases/postgresql10/Makefile.common +++ b/databases/postgresql10/Makefile.common @@ -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+= MSGFMT=${TOOLS_PATH.msgfmt} 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 --git a/databases/postgresql92-client/Makefile b/databases/postgresql92-client/Makefile index 17814607a72..1f581916697 100644 --- a/databases/postgresql92-client/Makefile +++ b/databases/postgresql92-client/Makefile @@ -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 --git a/databases/postgresql92/Makefile.common b/databases/postgresql92/Makefile.common index 52c986dee40..2719ca12b0f 100644 --- a/databases/postgresql92/Makefile.common +++ b/databases/postgresql92/Makefile.common @@ -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 @@ CONFIGURE_ARGS+= --without-zlib # 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 --git a/databases/postgresql93-client/Makefile b/databases/postgresql93-client/Makefile index b20c237d109..0df96252af6 100644 --- a/databases/postgresql93-client/Makefile +++ b/databases/postgresql93-client/Makefile @@ -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 --git a/databases/postgresql93/Makefile.common b/databases/postgresql93/Makefile.common index b3e73572e33..54f3075dd7f 100644 --- a/databases/postgresql93/Makefile.common +++ b/databases/postgresql93/Makefile.common @@ -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 @@ CONFIGURE_ARGS+= --without-zlib # 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 --git a/databases/postgresql94-client/Makefile b/databases/postgresql94-client/Makefile index 4720b51c58c..bcfc5974aa4 100644 --- a/databases/postgresql94-client/Makefile +++ b/databases/postgresql94-client/Makefile @@ -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 --git a/databases/postgresql94/Makefile.common b/databases/postgresql94/Makefile.common index 35b9c858d52..bcfccc7ea83 100644 --- a/databases/postgresql94/Makefile.common +++ b/databases/postgresql94/Makefile.common @@ -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 @@ CONFIGURE_ARGS+= --without-zlib # 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 --git a/databases/postgresql95-client/Makefile b/databases/postgresql95-client/Makefile index 0158d78695d..d5b1cb53296 100644 --- a/databases/postgresql95-client/Makefile +++ b/databases/postgresql95-client/Makefile @@ -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 --git a/databases/postgresql95/Makefile.common b/databases/postgresql95/Makefile.common index 59cbd53d31b..69c8bc07147 100644 --- a/databases/postgresql95/Makefile.common +++ b/databases/postgresql95/Makefile.common @@ -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_ARGS+= --without-zlib 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 --git a/databases/postgresql96-client/Makefile b/databases/postgresql96-client/Makefile index 0a84f74fb1a..43bdda05404 100644 --- a/databases/postgresql96-client/Makefile +++ b/databases/postgresql96-client/Makefile @@ -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 --git a/databases/postgresql96/Makefile.common b/databases/postgresql96/Makefile.common index 167a5cf2a68..936d76dc05e 100644 --- a/databases/postgresql96/Makefile.common +++ b/databases/postgresql96/Makefile.common @@ -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_ARGS+= --without-zlib 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 |