pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/buildlink3 We were writing the wrong directory path...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b98d5b98d342
branches:  trunk
changeset: 496089:b98d5b98d342
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Jun 22 21:08:37 2005 +0000

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

 mk/buildlink3/libtool-fix-la |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 28ce5de74bf1 -r b98d5b98d342 mk/buildlink3/libtool-fix-la
--- a/mk/buildlink3/libtool-fix-la      Wed Jun 22 20:43:22 2005 +0000
+++ b/mk/buildlink3/libtool-fix-la      Wed Jun 22 21:08:37 2005 +0000
@@ -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 @@
        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



Home | Main Index | Thread Index | Old Index