cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rev 1.334.2.72

Browse Source 
Add fully-qualified paths to temp_rpath rather than unqualified paths in order
to avoid possible errors when computing the fully-qualified path later.

rev 1.334.2.70

Do not add installed static litool libraries to convenience, they are not
convenience libraries.

From libtool CVS
This commit is contained in:
brad 2005-06-17 16:16:46 +00:00
parent e94d72bb53
commit 3cbe1f7cd8
3 changed files with 44 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devel/libtool/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.40 2005/05/23 20:01:48 brad Exp $ # $OpenBSD: Makefile,v 1.41 2005/06/17 16:16:46 brad Exp $
# $FreeBSD: Makefile,v 1.2 1998/09/23 16:15:53 vanilla Exp $ # $FreeBSD: Makefile,v 1.2 1998/09/23 16:15:53 vanilla Exp $
COMMENT= "generic shared library support script" COMMENT= "generic shared library support script"
@ -6,6 +6,7 @@ COMMENT-ltdl= "GNU libtool system independent dlopen wrapper"
VERSION= 1.5.18 VERSION= 1.5.18
DISTNAME= libtool-${VERSION} DISTNAME= libtool-${VERSION}
PKGNAME= ${DISTNAME}p1
PKGNAME-ltdl= libltdl-${VERSION} PKGNAME-ltdl= libltdl-${VERSION}
CATEGORIES= devel CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU:=libtool/} MASTER_SITES= ${MASTER_SITE_GNU:=libtool/}

24
devel/libtool/patches/patch-libltdl_ltmain_sh
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-libltdl_ltmain_sh,v 1.9 2005/05/23 20:01:49 brad Exp $ $OpenBSD: patch-libltdl_ltmain_sh,v 1.10 2005/06/17 16:16:46 brad Exp $
--- libltdl/ltmain.sh.orig Mon May 16 05:39:29 2005 --- libltdl/ltmain.sh.orig Mon May 16 05:39:29 2005
+++ libltdl/ltmain.sh Sun May 22 16:31:34 2005 +++ libltdl/ltmain.sh Fri Jun 17 09:52:53 2005
@@ -1985,6 +1985,17 @@ EOF @@ -1985,6 +1985,17 @@ EOF
;; ;;
esac esac
@ -50,6 +50,15 @@ $OpenBSD: patch-libltdl_ltmain_sh,v 1.9 2005/05/23 20:01:49 brad Exp $
continue continue
fi # $pass = conv fi # $pass = conv
@@ -2409,7 +2420,7 @@ EOF
case "$temp_rpath " in
*" $dir "*) ;;
*" $absdir "*) ;;
- *) temp_rpath="$temp_rpath $dir" ;;
+ *) temp_rpath="$temp_rpath $absdir" ;;
esac
fi
@@ -2645,7 +2656,7 @@ EOF @@ -2645,7 +2656,7 @@ EOF
add_dir= add_dir=
add= add=
@ -59,7 +68,16 @@ $OpenBSD: patch-libltdl_ltmain_sh,v 1.9 2005/05/23 20:01:49 brad Exp $
add="$libdir/$linklib" add="$libdir/$linklib"
elif test "$hardcode_minus_L" = yes; then elif test "$hardcode_minus_L" = yes; then
add_dir="-L$libdir" add_dir="-L$libdir"
@@ -5902,40 +5913,6 @@ relink_command=\"$relink_command\"" @@ -2729,8 +2740,6 @@ EOF
fi
fi
else
- convenience="$convenience $dir/$old_library"
- old_convenience="$old_convenience $dir/$old_library"
deplibs="$dir/$old_library $deplibs"
link_static=yes
fi
@@ -5902,40 +5911,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode. # Exit here if they wanted silent mode.
test "$show" = : && exit $EXIT_SUCCESS test "$show" = : && exit $EXIT_SUCCESS

24
devel/libtool/patches/patch-ltmain_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ltmain_in,v 1.9 2005/05/23 20:01:49 brad Exp $ $OpenBSD: patch-ltmain_in,v 1.10 2005/06/17 16:16:46 brad Exp $
--- ltmain.in.orig Wed May 4 15:13:00 2005 --- ltmain.in.orig Wed May 4 15:13:00 2005
+++ ltmain.in Sun May 22 16:31:34 2005 +++ ltmain.in Fri Jun 17 09:52:05 2005
@@ -1985,6 +1985,17 @@ EOF @@ -1985,6 +1985,17 @@ EOF
;; ;;
esac esac
@ -50,6 +50,15 @@ $OpenBSD: patch-ltmain_in,v 1.9 2005/05/23 20:01:49 brad Exp $
continue continue
fi # $pass = conv fi # $pass = conv
@@ -2409,7 +2420,7 @@ EOF
case "$temp_rpath " in
*" $dir "*) ;;
*" $absdir "*) ;;
- *) temp_rpath="$temp_rpath $dir" ;;
+ *) temp_rpath="$temp_rpath $absdir" ;;
esac
fi
@@ -2645,7 +2656,7 @@ EOF @@ -2645,7 +2656,7 @@ EOF
add_dir= add_dir=
add= add=
@ -59,7 +68,16 @@ $OpenBSD: patch-ltmain_in,v 1.9 2005/05/23 20:01:49 brad Exp $
add="$libdir/$linklib" add="$libdir/$linklib"
elif test "$hardcode_minus_L" = yes; then elif test "$hardcode_minus_L" = yes; then
add_dir="-L$libdir" add_dir="-L$libdir"
@@ -5902,40 +5913,6 @@ relink_command=\"$relink_command\"" @@ -2729,8 +2740,6 @@ EOF
fi
fi
else
- convenience="$convenience $dir/$old_library"
- old_convenience="$old_convenience $dir/$old_library"
deplibs="$dir/$old_library $deplibs"
link_static=yes
fi
@@ -5902,40 +5911,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode. # Exit here if they wanted silent mode.
test "$show" = : && exit $EXIT_SUCCESS test "$show" = : && exit $EXIT_SUCCESS