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.
This commit is contained in:
brook 2011-02-08 15:50:07 +00:00
parent 759fb79608
commit 38f8faa35b
3 changed files with 6 additions and 3 deletions

View file

@ -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,'

View file

@ -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,'

View file

@ -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,'