Re: -version-number on irix
On Fri, 2007-06-22 at 01:09 -0500, Bob Friesenhahn wrote: > On Fri, 22 Jun 2007, Peter O'Gorman wrote: > > > 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. > > This patch looks good to me. Thanks, I committed it. Peter
Re: -version-number on irix
On Fri, 22 Jun 2007, Peter O'Gorman wrote: 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. This patch looks good to me. Bob == Bob Friesenhahn [EMAIL PROTECTED], http://www.simplesystems.org/users/bfriesen/ GraphicsMagick Maintainer,http://www.GraphicsMagick.org/
-version-number on irix
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 - 1.334.2.141 +++ ltmain.in 22 Jun 2007 05:29:22 - @@ -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 - 1.80 +++ libltdl/config/ltmain.m4sh 22 Jun 2007 05:29:38 - @@ -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 ;;
Re: distchecking without FC?
On Thu, Jun 21, 2007 at 07:06:01PM +0200, Ralf Wildenhues wrote: > Yes, please apply. It would be nice if Benoit could confirm that it > works for him as well, and nice of you to mention him as bug reporter > in the ChangeLog entry. :-) Done. Thanks for the reviews and testing.
Re: distchecking without FC?
Quoting Ralf Wildenhues <[EMAIL PROTECTED]>: Hi Noah, Benoit, * Noah Misch wrote on Thu, Jun 21, 2007 at 03:54:14PM CEST: Here's the current version of that patch. It allows `make dist' to work on a system with no F77/F90 compilers. Suitable? Yes, please apply. It would be nice if Benoit could confirm that it works for him as well. Yes it Works For Me (c). Thank you very much guys. -- Benoit Sigoure aka Tsuna EPITA Research and Development Laboratory This message was sent using IMP, the Internet Messaging Program.
Re: distchecking without FC?
Hi Noah, Benoit, * Noah Misch wrote on Thu, Jun 21, 2007 at 03:54:14PM CEST: > > Here's the current version of that patch. It allows `make dist' to > work on a system with no F77/F90 compilers. Suitable? Yes, please apply. It would be nice if Benoit could confirm that it works for him as well, and nice of you to mention him as bug reporter in the ChangeLog entry. :-) Cheers, and thanks to both of you, Ralf > 2007-06-21 Noah Misch <[EMAIL PROTECTED]> > > * tests/f77demo/configure.ac [--with-dist]: New option. Skip most > Fortran checks when given. > * tests/fcdemo/configure.ac [--with-dist]: Likewise. > * Makefile.am (@DIST_MAKEFILE_LIST@): Pass --with-dist.
Re: distchecking without FC?
Hi Ralf,
On Tue, Jun 19, 2007 at 09:52:40PM +0200, Ralf Wildenhues wrote:
> * Noah Misch wrote on Tue, Jun 19, 2007 at 09:36:06PM CEST:
> > The current code gets that right, at least.
>
> Well, this is an argument for showing your latest version of
> tests/f{c,77}demo/configure.ac changes to become nonlethal in case of
> non-presence of Fortran (77) compilers. Did you get much further there?
Here's the current version of that patch. It allows `make dist' to work on a
system with no F77/F90 compilers. Suitable?
> > We must bootstrap the test directories first (so the relevant files
> > exist), then generate test-dist.mk, then bootstrap the root directory
> > (where Makefile.am includes test-dist.mk).
>
> Sure. That's why I suggested repeating the loop down below again, but
> now only picking `.'. I simply thought that a second loop looks cleaner
> (and is probably faster) than a complicated case expression. But since
> we're rather moving away from this patch variant, this minor point
> matters little.
Ah; I misunderstood you. Yes.
2007-06-21 Noah Misch <[EMAIL PROTECTED]>
* tests/f77demo/configure.ac [--with-dist]: New option. Skip most
Fortran checks when given.
* tests/fcdemo/configure.ac [--with-dist]: Likewise.
* Makefile.am (@DIST_MAKEFILE_LIST@): Pass --with-dist.
diff -urp -X ../dontdiff lt-clean/Makefile.am lt-fdist/Makefile.am
--- lt-clean/Makefile.am2007-06-14 12:37:28.0 -0400
+++ lt-fdist/Makefile.am2007-06-21 08:17:49.0 -0400
@@ -109,7 +109,7 @@ configure-subdirs distdir: $(DIST_MAKEFI
dir=`echo $@ | sed 's,^[^/]*$$,.,;s,/[^/]*$$,,'`; \
test -d $$dir || mkdir $$dir || exit 1; \
abs_srcdir=`$(lt__cd) $(srcdir) && pwd`; \
- (cd $$dir && $$abs_srcdir/$$dir/configure) || exit 1
+ (cd $$dir && $$abs_srcdir/$$dir/configure --with-dist) || exit 1
# -- #
diff -urp -X ../dontdiff lt-clean/tests/f77demo/configure.ac
lt-fdist/tests/f77demo/configure.ac
--- lt-clean/tests/f77demo/configure.ac 2007-03-25 07:12:43.0 -0500
+++ lt-fdist/tests/f77demo/configure.ac 2007-06-21 09:18:41.0 -0400
@@ -31,6 +31,9 @@ AC_CONFIG_HEADERS([config.h:config-h.in]
AC_CONFIG_SRCDIR([foof.f])
AC_CONFIG_AUX_DIR([../../libltdl/config])
+AC_ARG_WITH([dist], AS_HELP_STRING([--with-dist],
+ [ignore errors not affecting `make dist']))
+
## ##
## Automake Initialisation. ##
## ##
@@ -46,10 +49,14 @@ AC_PROG_CC
## Fortran compiler checks. ##
## ##
AC_PROG_F77
-dnl Check the flags needed to link f77 programs with ld (i.e. cc)
-AC_F77_LIBRARY_LDFLAGS
-dnl Check for underscoring of external names
-AC_F77_WRAPPERS
+dnl When configuring for `make dist' purposes, skip checks that may yield fatal
+dnl errors when there is no working F77 compiler.
+if test -z "$with_dist"; then
+ dnl Check the flags needed to link f77 programs with ld (i.e. cc)
+ AC_F77_LIBRARY_LDFLAGS
+ dnl Check for underscoring of external names
+ AC_F77_WRAPPERS
+fi
## --- ##
## Libtool initialisation. ##
diff -urp -X ../dontdiff lt-clean/tests/fcdemo/configure.ac
lt-fdist/tests/fcdemo/configure.ac
--- lt-clean/tests/fcdemo/configure.ac 2007-03-25 07:12:43.0 -0500
+++ lt-fdist/tests/fcdemo/configure.ac 2007-06-21 09:18:50.0 -0400
@@ -31,6 +31,9 @@ AC_CONFIG_HEADERS([config.h:config-h.in]
AC_CONFIG_SRCDIR([foof.f90])
AC_CONFIG_AUX_DIR([../../libltdl/config])
+AC_ARG_WITH([dist], AS_HELP_STRING([--with-dist],
+ [ignore errors not affecting `make dist']))
+
## ##
## Automake Initialisation. ##
## ##
@@ -47,15 +50,19 @@ AC_PROG_CC
## ##
AC_LANG_PUSH([Fortran])
AC_PROG_FC
-dnl Check the flags needed to link fc programs with ld (i.e. cc)
-AC_FC_LIBRARY_LDFLAGS
-dnl Check for underscoring of external names
-AC_FC_WRAPPERS
-dnl We need to use .f90 and not .f to enable Automake FC support
-dnl Some Intel ifc/ifort do not understand .f95. :-/
-AC_FC_SRCEXT([f90])
-dnl Yes, we want free form Fortran!
-AC_FC_FREEFORM
+dnl When configuring for `make dist' purposes, skip checks that may yield fatal
+dnl errors when there is no working F90 compiler.
+if test -z "$with_dist"; then
+ dnl Check the flags needed to link fc programs with ld (i.e. cc)
+ AC_FC_LIBRARY_LDFLAGS
+ dnl Check for underscoring of external names
+ AC_FC_WRAPPERS
+ dnl We need to use .f90 and not .f to enable Automake FC support
+ dnl Some Intel ifc/ifort do not understand .f95. :-/
+ AC_FC_SRCEXT([f90])
+ dnl Yes, we want free form Fortran!
+ AC_FC_FREEFORM
+fi
AC_LANG_POP
## --- ##
