From f5b5859be0c70bd0d6aac05375edd7972e64da50 Mon Sep 17 00:00:00 2001 From: jschauma Date: Mon, 23 Dec 2002 19:32:12 +0000 Subject: Make sure that shlibs built on IRIX use the same major version number as on others. --- devel/libtool/distinfo | 5 +-- devel/libtool/patches/patch-ab | 69 ++++++++++++++++++------------------------ devel/libtool/patches/patch-ap | 13 ++++++++ 3 files changed, 46 insertions(+), 41 deletions(-) create mode 100644 devel/libtool/patches/patch-ap (limited to 'devel') diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo index f1b39ceef5f..20538db73fc 100644 --- a/devel/libtool/distinfo +++ b/devel/libtool/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.19 2002/11/17 11:55:01 grant Exp $ +$NetBSD: distinfo,v 1.20 2002/12/23 19:32:12 jschauma Exp $ SHA1 (libtool-ml-20010614.tar.gz) = ff746666737e420592c3017d65bf4c47f1430dac Size (libtool-ml-20010614.tar.gz) = 784246 bytes SHA1 (patch-aa) = 6efa2e2aba991cd3d40b41cecb58a3ccc8980c1c -SHA1 (patch-ab) = 1d23b17b2d1ce914e5665b3cbc0adc6590fca827 +SHA1 (patch-ab) = 8bdaa1db82a3c302374bb6833d0296d61851ee39 SHA1 (patch-ac) = 61196acaa12edee0b1209b2ba7c6414453bfa438 SHA1 (patch-ad) = 6aab76688d0f55648e35adc45a3492ba9c87acfb SHA1 (patch-ae) = 03de2a4fc9d828d62c6e6126ecf2dbbfeb1d82ea @@ -16,3 +16,4 @@ SHA1 (patch-ak) = 7e7c6a515361863b683bbc8be24c8146501ca864 SHA1 (patch-al) = 22f1b7289d9ba477255e66364ae23af24a298dd0 SHA1 (patch-am) = cedc92d0e229ced47ca5eb6ad4997fb1506d5ec9 SHA1 (patch-ao) = 4e115e9d6ddde556205dc786cde471bfee5a5e9e +SHA1 (patch-ap) = 4e766ab10c1ab9fe47a94816cc51bdeff651a0b4 diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab index fda1723c1d8..302ff0450ea 100644 --- a/devel/libtool/patches/patch-ab +++ b/devel/libtool/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.25 2002/03/26 16:31:28 skrll Exp $ +$NetBSD: patch-ab,v 1.26 2002/12/23 19:32:13 jschauma Exp $ ---- ltmain.sh.orig Thu Jun 14 05:06:50 2001 -+++ ltmain.sh +--- ltmain.sh.orig Thu Jun 14 00:06:50 2001 ++++ ltmain.sh Mon Dec 23 13:23:11 2002 @@ -211,6 +211,8 @@ --mode) prevopt="--mode" prev=mode ;; --mode=*) mode="$optarg" ;; @@ -83,13 +83,10 @@ $NetBSD: patch-ab,v 1.25 2002/03/26 16:31:28 skrll Exp $ # Find all interdependent deplibs by searching for libraries # that are linked more than once (e.g. -la -lb -la) for deplib in $deplibs; do -- case "$libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -- esac + if test "X$duplicate_deps" = "Xyes" ; then -+ case "$libs " in -+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ esac + case "$libs " in + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + esac + fi libs="$libs $deplib" done @@ -98,19 +95,13 @@ $NetBSD: patch-ab,v 1.25 2002/03/26 16:31:28 skrll Exp $ # $postdeps and mark them as special (i.e., whose duplicates are # not to be eliminated). pre_post_deps= -- for pre_post_dep in $predeps $postdeps; do -- case "$pre_post_deps " in -- *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; -- esac -- pre_post_deps="$pre_post_deps $pre_post_dep" -- done + if test "X$duplicate_deps" = "Xyes" ; then -+ for pre_post_dep in $predeps $postdeps; do -+ case "$pre_post_deps " in -+ *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; -+ esac -+ pre_post_deps="$pre_post_deps $pre_post_dep" -+ done + for pre_post_dep in $predeps $postdeps; do + case "$pre_post_deps " in + *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; + esac + pre_post_deps="$pre_post_deps $pre_post_dep" + done + fi pre_post_deps= fi @@ -119,13 +110,10 @@ $NetBSD: patch-ab,v 1.25 2002/03/26 16:31:28 skrll Exp $ tmp_libs= for deplib in $dependency_libs; do deplibs="$deplib $deplibs" -- case "$tmp_libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -- esac + if test "X$duplicate_deps" = "Xyes" ; then -+ case "$tmp_libs " in -+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ esac + case "$tmp_libs " in + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + esac + fi tmp_libs="$tmp_libs $deplib" done @@ -134,13 +122,10 @@ $NetBSD: patch-ab,v 1.25 2002/03/26 16:31:28 skrll Exp $ # or/and link against static libraries newdependency_libs="$deplib $newdependency_libs" fi -- case "$tmp_libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -- esac + if test "X$duplicate_deps" = "Xyes" ; then -+ case "$tmp_libs " in -+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ esac + case "$tmp_libs " in + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + esac + fi tmp_libs="$tmp_libs $deplib" done # for deplib @@ -149,17 +134,23 @@ $NetBSD: patch-ab,v 1.25 2002/03/26 16:31:28 skrll Exp $ tmp_libs= for deplib in $dependency_libs; do newdependency_libs="$deplib $newdependency_libs" -- case "$tmp_libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -- esac + if test "X$duplicate_deps" = "Xyes" ; then -+ case "$tmp_libs " in -+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ esac + case "$tmp_libs " in + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + esac + fi tmp_libs="$tmp_libs $deplib" done +@@ -2582,7 +2610,7 @@ + ;; + + irix) +- major=`expr $current - $age + 1` ++ major=`expr $current - $age` + verstring="sgi$major.$revision" + + # Add in all the interfaces that we are compatible with. @@ -5053,7 +5081,7 @@ fi diff --git a/devel/libtool/patches/patch-ap b/devel/libtool/patches/patch-ap new file mode 100644 index 00000000000..6863bbbcaa5 --- /dev/null +++ b/devel/libtool/patches/patch-ap @@ -0,0 +1,13 @@ +$NetBSD: patch-ap,v 1.1 2002/12/23 19:32:13 jschauma Exp $ + +--- ltmain.in.orig Mon Dec 23 13:23:38 2002 ++++ ltmain.in Mon Dec 23 13:23:45 2002 +@@ -2582,7 +2582,7 @@ + ;; + + irix) +- major=`expr $current - $age + 1` ++ major=`expr $current - $age` + verstring="sgi$major.$revision" + + # Add in all the interfaces that we are compatible with. -- cgit v1.2.3