diff options
| author | jlam <jlam@pkgsrc.org> | 2002-09-20 00:59:48 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-09-20 00:59:48 +0000 |
| commit | 424a6c350f459c7a667fecbbf157ba4d59ffc50a (patch) | |
| tree | f574b94d26fae14237e361302c41c29d79462721 | |
| parent | c54fb6c8cd0f36ff56f8a7a59f3de5c0bdec029b (diff) | |
| download | pkgsrc-424a6c350f459c7a667fecbbf157ba4d59ffc50a.tar.gz | |
Fix problem with linking against uninstalled libtool archives that in turn
depend on other uninstalled libtool archives. During the relinking process
the newly installed libraries weren't being found. We now insert the
appropriate -Ldir flags to allow them to be found in the uninstalled
locations.
| -rw-r--r-- | mk/buildlink2/libtool-fix-la | 55 |
1 files changed, 47 insertions, 8 deletions
diff --git a/mk/buildlink2/libtool-fix-la b/mk/buildlink2/libtool-fix-la index 912aa5a4e48..5cc5605fbae 100644 --- a/mk/buildlink2/libtool-fix-la +++ b/mk/buildlink2/libtool-fix-la @@ -1,4 +1,4 @@ -# $NetBSD: libtool-fix-la,v 1.4 2002/09/18 02:14:35 jlam Exp $ +# $NetBSD: libtool-fix-la,v 1.5 2002/09/20 00:59:48 jlam Exp $ # # For *.la files, in the "relink_command" line, we make the following # replacements: @@ -19,6 +19,31 @@ laifile=${ladir}/.libs/${labase}.lai if [ -f $lafile ]; then . ${ladir}/${labase}.la + deps= + for i in ${dependency_libs}; do + case "$i" in + -L*) + case "$deps" in + *"$i "*) ;; + *"$i") ;; + *) deps="${deps} $i" ;; + esac + ;; + *.la) + ltlibsdir=`@DIRNAME@ $i`/.libs + case "$deps" in + *"-L$ltlibsdir "*) ;; + *"-L$ltlibsdir") ;; + *) deps="$deps -L$ltlibsdir" ;; + esac + deps="${deps} $i" + ;; + *) + deps="${deps} $i" + ;; + esac + done + relink= for i in ${relink_command}; do case "$i" in @@ -48,16 +73,30 @@ if [ -f $lafile ]; then ;; esac done - if [ -n "$relink" ] && \ + if [ -n "$deps" -o -n "$relink" ] && \ ! @EGREP@ "^#.*modified by buildlink2" $lafile >/dev/null 2>&1; then @MV@ -f $lafile ${lafile}.blsav - ( - @CAT@ ${lafile}.blsav | @SED@ -e '/^relink_command=/,$d' + if [ -n "$deps" ]; then + ( + @CAT@ ${lafile}.blsav | @SED@ -e '/^dependency_libs=/,$d' + @ECHO@ "dependency_libs='$deps'" + @CAT@ ${lafile}.blsav | @SED@ -e '1,/^dependency_libs=/d' + ) > ${lafile}.tmp + else + @CAT@ ${lafile}.blsav > ${lafile}.tmp + fi + if [ -n "$relink" ]; then + ( + @CAT@ ${lafile}.tmp | @SED@ -e '/^relink_command=/,$d' @ECHO@ "relink_command='$relink'" - @CAT@ ${lafile}.blsav | @SED@ -e '1,/^relink_command=/d' - @ECHO@ - @ECHO@ "# This file has been modified by buildlink2." - ) > $lafile + @CAT@ ${lafile}.tmp | @SED@ -e '1,/^relink_command=/d' + ) > $lafile + else + @CAT@ ${lafile}.tmp > $lafile + fi + @ECHO@ >> $lafile + @ECHO@ "# This file has been modified by buildlink2." >> $lafile + @RM@ ${lafile}.tmp @ECHO@ "==> Fixed $lafile" >> $wrapperlog fi if [ -n "$laifile" ] && [ -f "$laifile" ] && \ |