1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-21 20:38:45 +00:00

Add a patch to support gnome 2.10 sharedlib version.

Patch made by ahze limited testing done by me.

Obtained from:	libtool cvs.
This commit is contained in:
Koop Mast 2005-03-07 18:09:29 +00:00
parent 7e77089072
commit f1307b502c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=130548
2 changed files with 55 additions and 8 deletions

View File

@ -7,7 +7,7 @@
PORTNAME?= libtool
PORTVERSION= 1.5.10
PORTREVISION?= 0
PORTREVISION?= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= libtool

View File

@ -1,11 +1,17 @@
--- ltmain.sh.orig Sun Apr 11 05:44:45 2004
+++ ltmain.sh Wed Jun 9 18:21:15 2004
@@ -1358,3 +1358,3 @@
--- ltmain.sh.orig Sun Sep 19 08:34:44 2004
+++ ltmain.sh Mon Mar 7 12:53:53 2005
@@ -1477,7 +1477,7 @@
esac
elif test "X$arg" = "X-lc_r"; then
case $host in
- *-*-openbsd* | *-*-freebsd*)
+ *-*-openbsd* | *-*-freebsd4*)
# Do not include libc_r directly, use -pthread flag.
@@ -1375,2 +1375,8 @@
continue
;;
@@ -1494,6 +1494,12 @@
-module)
module=yes
+ case $host in
+ *-*-freebsd*)
@ -14,17 +20,56 @@
+ ;;
+ esac
continue
@@ -1858,2 +1864,3 @@
;;
@@ -1977,6 +1983,7 @@
finalize_deplibs="$deplib $finalize_deplibs"
else
deplibs="$deplib $deplibs"
+ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
fi
@@ -4409,2 +4416,5 @@
continue
;;
@@ -3084,7 +3091,7 @@
# Check that each of the things are valid numbers.
case $current in
- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
*)
$echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
$echo "$modename: \`$vinfo' is not valid version information" 1>&2
@@ -3093,7 +3100,7 @@
esac
case $revision in
- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
*)
$echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
$echo "$modename: \`$vinfo' is not valid version information" 1>&2
@@ -3102,7 +3109,7 @@
esac
case $age in
- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
*)
$echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
$echo "$modename: \`$vinfo' is not valid version information" 1>&2
@@ -4442,6 +4449,9 @@
compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
;;
+ *-*-freebsd*)
+ # FreeBSD doesn't need this...
+ ;;
*)
@@ -5549,6 +5559,13 @@
$echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
exit $EXIT_FAILURE
@@ -5527,10 +5537,17 @@
fi
# Install the pseudo-library for information purposes.
- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- instname="$dir/$name"i
@ -42,3 +87,5 @@
+ ;;
+ esac
# Maybe install the static library, too.
test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"