[pkgsrc/trunk]: pkgsrc/mk/buildlink3 Fix build of the packages which pass .la...

[hira <hira%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/89785bb88a76
branches:  trunk
changeset: 504349:89785bb88a76
user:      hira <hira%pkgsrc.org@localhost>
date:      Fri Dec 09 16:16:41 2005 +0000

description:
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:

 mk/buildlink3/bsd.buildlink3.mk |  3 ++-
 mk/buildlink3/libtool-fix-la    |  6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diffs (46 lines):

diff -r 455366958d4a -r 89785bb88a76 mk/buildlink3/bsd.buildlink3.mk
--- a/mk/buildlink3/bsd.buildlink3.mk   Fri Dec 09 16:10:43 2005 +0000
+++ b/mk/buildlink3/bsd.buildlink3.mk   Fri Dec 09 16:16:41 2005 +0000
@@ -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 @@
                         -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 -r 455366958d4a -r 89785bb88a76 mk/buildlink3/libtool-fix-la
--- a/mk/buildlink3/libtool-fix-la      Fri Dec 09 16:10:43 2005 +0000
+++ b/mk/buildlink3/libtool-fix-la      Fri Dec 09 16:16:41 2005 +0000
@@ -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 @@
 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 @@
        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