diff options
| author | brook <brook@pkgsrc.org> | 2011-02-08 15:50:07 +0000 |
|---|---|---|
| committer | brook <brook@pkgsrc.org> | 2011-02-08 15:50:07 +0000 |
| commit | 4e7fc1394d81c570ff0aa5765ff77bf4d4c48a30 (patch) | |
| tree | 8d4da883a5b71b2ece4775ea6f7b3673191fd3ee | |
| parent | f0692acd56a20bd0dc0cf404868eb683b867378d (diff) | |
| download | pkgsrc-4e7fc1394d81c570ff0aa5765ff77bf4d4c48a30.tar.gz | |
Substitutions in src/Makefile.global end up creating an incorrect path to
ld. As a result, the installed version of this file is not useful for
building PostgreSQL extensions. Instead, replace with ${LD}. See the
discussion beginning with
http://mail-index.netbsd.org/tech-pkg/2011/02/07/msg006685.html
for more information.
| -rw-r--r-- | databases/postgresql83-client/Makefile | 3 | ||||
| -rw-r--r-- | databases/postgresql84-client/Makefile | 3 | ||||
| -rw-r--r-- | databases/postgresql90-client/Makefile | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/databases/postgresql83-client/Makefile b/databases/postgresql83-client/Makefile index a64b739e288..6b1f19bb80b 100644 --- a/databases/postgresql83-client/Makefile +++ b/databases/postgresql83-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2010/12/19 09:53:53 adam Exp $ +# $NetBSD: Makefile,v 1.20 2011/02/08 15:50:07 brook Exp $ PKGNAME= ${DISTNAME:C/-/83-client-/} COMMENT= PostgreSQL database client programs @@ -57,6 +57,7 @@ SUBST_STAGE.pgxs= post-build SUBST_MESSAGE.pgxs= Fixing workdir tools references in pgxs Makefile SUBST_FILES.pgxs= src/Makefile.global SUBST_SED.pgxs= -e 's,${WRKDIR}/.tools,${PREFIX},' +SUBST_SED.pgxs+= -e 's,${WRKDIR}/.wrapper/bin/ld,${LD},' SUBST_SED.pgxs+= -e 's,${WRKDIR}/.wrapper,${PREFIX},' SUBST_SED.pgxs+= -e 's,${WRKSRC},/dev/null,' diff --git a/databases/postgresql84-client/Makefile b/databases/postgresql84-client/Makefile index b38f9a8b45f..3aac5e717dc 100644 --- a/databases/postgresql84-client/Makefile +++ b/databases/postgresql84-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2010/12/19 09:53:41 adam Exp $ +# $NetBSD: Makefile,v 1.12 2011/02/08 15:50:07 brook Exp $ PKGNAME= ${DISTNAME:C/-/84-client-/} COMMENT= PostgreSQL database client programs @@ -57,6 +57,7 @@ SUBST_STAGE.pgxs= post-build SUBST_MESSAGE.pgxs= Fixing workdir tools references in pgxs Makefile SUBST_FILES.pgxs= src/Makefile.global SUBST_SED.pgxs= -e 's,${WRKDIR}/.tools,${PREFIX},' +SUBST_SED.pgxs+= -e 's,${WRKDIR}/.wrapper/bin/ld,${LD},' SUBST_SED.pgxs+= -e 's,${WRKDIR}/.wrapper,${PREFIX},' SUBST_SED.pgxs+= -e 's,${WRKSRC},/dev/null,' diff --git a/databases/postgresql90-client/Makefile b/databases/postgresql90-client/Makefile index edaa658f3dc..325b43cf15e 100644 --- a/databases/postgresql90-client/Makefile +++ b/databases/postgresql90-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2010/12/24 03:41:38 asau Exp $ +# $NetBSD: Makefile,v 1.5 2011/02/08 15:50:07 brook Exp $ PKGNAME= ${DISTNAME:C/-/90-client-/} COMMENT= PostgreSQL database client programs @@ -60,6 +60,7 @@ SUBST_STAGE.pgxs= post-build SUBST_MESSAGE.pgxs= Fixing workdir tools references in pgxs Makefile SUBST_FILES.pgxs= src/Makefile.global SUBST_SED.pgxs= -e 's,${WRKDIR}/.tools,${PREFIX},' +SUBST_SED.pgxs+= -e 's,${WRKDIR}/.wrapper/bin/ld,${LD},' SUBST_SED.pgxs+= -e 's,${WRKDIR}/.wrapper,${PREFIX},' SUBST_SED.pgxs+= -e 's,${WRKSRC},/dev/null,' |