Hi,
When lbuilding libpng-1.2.18 on Irix, we ran across this gem:
libtool: link: AGE `18' is greater than the current interface number
`17'
libtool: link: `0:18:0' is not valid version information

This is because libpng has '-version-number 0:18:0' - they really want
a .18. in their library name...

When -version-number was added, the major number was decremented as it
would later be incremented, however, when major is 0, it fails as above.
This patch does not decrement, and, if -version-number does not
increment later, thus avoiding the test.

Ok?

Peter

2007-06-22  Peter O'Gorman  <[EMAIL PROTECTED]>

	* ltmain.in (version-number) [irix]: Don't subtract 1 from
	major as it may be less than age.

Index: ltmain.in
===================================================================
RCS file: /sources/libtool/libtool/Attic/ltmain.in,v
retrieving revision 1.334.2.141
diff -u -r1.334.2.141 ltmain.in
--- ltmain.in	28 May 2007 07:03:51 -0000	1.334.2.141
+++ ltmain.in	22 Jun 2007 05:29:22 -0000
@@ -3239,9 +3239,10 @@
 	    age="0"
 	    ;;
 	  irix|nonstopux)
-	    current=`expr $number_major + $number_minor - 1`
+	    current=`expr $number_major + $number_minor`
 	    age="$number_minor"
 	    revision="$number_minor"
+	    lt_irix_increment=no
 	    ;;
 	  esac
 	  ;;
@@ -3315,8 +3316,11 @@
 	  ;;
 
 	irix | nonstopux)
-	  major=`expr $current - $age + 1`
-
+	  if test "X$lt_irix_increment" = "Xno"; then
+	    major=`expr $current - $age`
+	  else
+	    major=`expr $current - $age + 1`
+	  fi
 	  case $version_type in
 	    nonstopux) verstring_prefix=nonstopux ;;
 	    *)         verstring_prefix=sgi ;;
2007-06-22  Peter O'Gorman  <[EMAIL PROTECTED]>

	* libltdl/config/ltmain.m4sh (version-number) [irix]: Don't subtract
	1 from major as it may be less than age.

Index: libltdl/config/ltmain.m4sh
===================================================================
RCS file: /sources/libtool/libtool/libltdl/config/ltmain.m4sh,v
retrieving revision 1.80
diff -u -r1.80 ltmain.m4sh
--- libltdl/config/ltmain.m4sh	19 Jun 2007 05:43:16 -0000	1.80
+++ libltdl/config/ltmain.m4sh	22 Jun 2007 05:29:38 -0000
@@ -5189,9 +5189,10 @@
 	    age="0"
 	    ;;
 	  irix|nonstopux)
-	    current=`expr $number_major + $number_minor - 1`
+	    current=`expr $number_major + $number_minor`
 	    age="$number_minor"
 	    revision="$number_minor"
+	    lt_irix_increment=no
 	    ;;
 	  esac
 	  ;;
@@ -5261,7 +5262,11 @@
 	  ;;
 
 	irix | nonstopux)
-	  major=`expr $current - $age + 1`
+	  if test "X$lt_irix_increment" = "Xno"; then
+	    major=`expr $current - $age`
+	  else
+	    major=`expr $current - $age + 1`
+	  fi
 
 	  case $version_type in
 	    nonstopux) verstring_prefix=nonstopux ;;

Reply via email to