summaryrefslogtreecommitdiff
path: root/mk/buildlink3/libtool-fix-la
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2005-06-22 21:08:37 +0000
committerjlam <jlam@pkgsrc.org>2005-06-22 21:08:37 +0000
commit4149dcc90e876652f230ee82dfc0d99b3b30ccc2 (patch)
tree650b6ba2548055ff4e6cb49671cf72786e98753c /mk/buildlink3/libtool-fix-la
parente824f55f2bcf57d8b7816f0669463a928bebf4d0 (diff)
downloadpkgsrc-4149dcc90e876652f230ee82dfc0d99b3b30ccc2.tar.gz
We were writing the wrong directory path for the location to the
uninstalled libtool archive in the case where we build it into some place other than the current directory. Older versions of libtool didn't allow you to build a *.la file anywhere other than the current directory, and libtool-fix-la made use of this assumption in libtool's behavior. More recent versions of libtool *do* let you build a *.la file anywhere you'd like, so instead of blindly assuming it's the current directory, use the path to the argument of the -o option. This embeds the proper directory path into the uninstalled libtool archive. This has no impact on packages that just build libtool archives into the current directory. The packages that *are* impacted are the ones that: (1) pkgsrc converted to use libtool, and, (2) build shared libraries that are linked into other things as part of the build, and, (3) builds the libtool archives in some place other than the current directory.
Diffstat (limited to 'mk/buildlink3/libtool-fix-la')
-rw-r--r--mk/buildlink3/libtool-fix-la4
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/buildlink3/libtool-fix-la b/mk/buildlink3/libtool-fix-la
index 2c29464e1b9..0b5a605717d 100644
--- a/mk/buildlink3/libtool-fix-la
+++ b/mk/buildlink3/libtool-fix-la
@@ -1,4 +1,4 @@
-# $NetBSD: libtool-fix-la,v 1.5 2004/09/21 15:01:40 jlam Exp $
+# $NetBSD: libtool-fix-la,v 1.6 2005/06/22 21:08:37 jlam Exp $
#
# Copyright (c) 2004 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -216,7 +216,7 @@ if $test -f $lafile; then
fi
$echo >> $lafile
$echo "# Directory that this library was built in:" >> $lafile
- $echo "buildlibdir='"`cd .; $pwd`"'" >> $lafile
+ $echo "buildlibdir='"`cd $ladir; $pwd`"'" >> $lafile
$echo >> $lafile
$echo "# This file has been modified by buildlink3." >> $lafile
$rm ${lafile}.tmp