diff options
| author | hira <hira@pkgsrc.org> | 2005-12-09 16:16:41 +0000 |
|---|---|---|
| committer | hira <hira@pkgsrc.org> | 2005-12-09 16:16:41 +0000 |
| commit | ed44db6a86dd9c2ea7cc0088c2097fe97f0caa80 (patch) | |
| tree | 22f7117e252b189f82972b161a9ba79c64627a82 /mk | |
| parent | a045fbf993752fbfa53ec20f7fb29adfc3c41828 (diff) | |
| download | pkgsrc-ed44db6a86dd9c2ea7cc0088c2097fe97f0caa80.tar.gz | |
Fix build of the packages which pass .la files to libtool by relative
path. This allows to use symbolic linked path as WRKOBJDIR and should
fix PR pkg/31337.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/buildlink3/bsd.buildlink3.mk | 3 | ||||
| -rw-r--r-- | mk/buildlink3/libtool-fix-la | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk index 3483df9212a..d7f07449d35 100644 --- a/mk/buildlink3/bsd.buildlink3.mk +++ b/mk/buildlink3/bsd.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink3.mk,v 1.171 2005/06/01 18:03:06 jlam Exp $ +# $NetBSD: bsd.buildlink3.mk,v 1.172 2005/12/09 16:16:41 hira Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -1035,6 +1035,7 @@ ${WRAPPER_TMPDIR}/libtool-fix-la: ${BUILDLINK_SRCDIR}/libtool-fix-la -e "s|@DIRNAME@|${DIRNAME:Q}|g" \ -e "s|@EGREP@|${EGREP:Q}|g" \ -e "s|@MV@|${MV:Q}|g" \ + -e "s|@PWD@|${PWD_CMD:Q}|g" \ -e "s|@RM@|${RM:Q}|g" \ | ${_WRAP_SH_CRUNCH_FILTER} > ${.TARGET} diff --git a/mk/buildlink3/libtool-fix-la b/mk/buildlink3/libtool-fix-la index 0b5a605717d..e9826513116 100644 --- a/mk/buildlink3/libtool-fix-la +++ b/mk/buildlink3/libtool-fix-la @@ -1,4 +1,4 @@ -# $NetBSD: libtool-fix-la,v 1.6 2005/06/22 21:08:37 jlam Exp $ +# $NetBSD: libtool-fix-la,v 1.7 2005/12/09 16:16:41 hira Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -60,8 +60,10 @@ basename="@BASENAME@" dirname="@DIRNAME@" egrep="@EGREP@" mv="@MV@" +pwd="@PWD@" rm="@RM@" +wrksrc_physical=`cd ${WRKSRC}; $pwd` labase=`$basename $lafile .la` ladir=`$dirname $lafile` latimestamp=${ladir}/.${labase}.la.timestamp @@ -216,7 +218,7 @@ if $test -f $lafile; then fi $echo >> $lafile $echo "# Directory that this library was built in:" >> $lafile - $echo "buildlibdir='"`cd $ladir; $pwd`"'" >> $lafile + $echo "buildlibdir='"`cd $ladir; $pwd | $sed -e "s,^${wrksrc_physical},${WRKSRC},"`"'" >> $lafile $echo >> $lafile $echo "# This file has been modified by buildlink3." >> $lafile $rm ${lafile}.tmp |