Re: [SCM] GNU Libtool branch, master, updated. v2.4-58-g789817d

[Peter Rosin]

Hi Gary,

Extreme nits follows, you have been warned...

Cheers,
Peter

Gary V. Vaughan skrev 2011-10-17 07:42:
> This is an automated email from the git hooks/post-receive script. It was
> generated because a ref change was pushed to the repository containing
> the project "GNU Libtool".
> 
> The branch, master has been updated
>        via  789817d512111d063981446efc7493ce87696bb3 (commit)
>       from  ecb2ab031be600951c779cb37b885c911c7adb79 (commit)
> 
> Those revisions listed above that are new to this repository have
> not appeared on any other notification email; so we list those
> revisions in full, below.
> 
> - Log -----------------------------------------------------------------
> commit 789817d512111d063981446efc7493ce87696bb3
> Author: Gary V. Vaughan <address@hidden>
> Date:   Mon Oct 17 12:40:55 2011 +0700
> 
>     Make a note to use gnu/linux for version_type.
>     
>     * libltdl/m4/libtool.m4 (version_type): Add a comment to change
>     version_type setting from 'linux' to 'gnu/linux' during the next
>     destabilising code refactoring.
>     * libltdl/config/ltmain.m4sh: ditto.
>     
>     Requested by Richard Stallman.
> 
> -----------------------------------------------------------------------
> 
> Summary of changes:
>  ChangeLog                  |    9 +++++++++
>  libltdl/config/ltmain.m4sh |    3 ++-
>  libltdl/m4/libtool.m4      |   30 +++++++++++++++---------------
>  3 files changed, 26 insertions(+), 16 deletions(-)
> 
> diff --git a/ChangeLog b/ChangeLog
> index 5f0d76f..2d72150 100644
> --- a/ChangeLog
> +++ b/ChangeLog
> @@ -1,3 +1,12 @@
> +2011-10-17  Gary V. Vaughan  <address@hidden>
> +
> +     Make a note to use gnu/linux for version_type.
> +     * libltdl/m4/libtool.m4 (version_type): Add a comment to change
> +     version_type setting from 'linux' to 'gnu/linux' during the next
> +     destabilising code refactoring.
> +     * libltdl/config/ltmain.m4sh: ditto.
> +     Requested by Richard Stallman.
> +
>  2011-10-04  Bart Van Assche <address@hidden>
>  
>       Typo fix - change func_apped into func_append
> diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
> index 054bb4c..f9f52e7 100644
> --- a/libltdl/config/ltmain.m4sh
> +++ b/libltdl/config/ltmain.m4sh
> @@ -6543,6 +6543,7 @@ func_mode_link ()
>         # which has an extra 1 added just for fun
>         #
>         case $version_type in
> +          # correct linux to gnu/linux during the next big refactor

You're not following the whitespace convention of the surrounding code.

>          darwin|linux|osf|windows|none)
>           func_arith $number_major + $number_minor
>           current=$func_arith_result
> @@ -6659,7 +6660,7 @@ func_mode_link ()
>         versuffix="$major.$revision"
>         ;;
>  
> -     linux)
> +        linux)  # correct to gnu/linux during the next big refactor

Dito.

>         func_arith $current - $age
>         major=.$func_arith_result
>         versuffix="$major.$age.$revision"
> diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
> index 0de7f3c..a61f6de 100644
> --- a/libltdl/m4/libtool.m4
> +++ b/libltdl/m4/libtool.m4
> @@ -2247,7 +2247,7 @@ need_version=unknown
>  
>  case $host_os in
>  aix3*)
> -  version_type=linux
> +  version_type=linux # correct to gnu/linux during the next big refactor
>    library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
>    shlibpath_var=LIBPATH
>  
> @@ -2256,7 +2256,7 @@ aix3*)
>    ;;
>  
>  aix[[4-9]]*)
> -  version_type=linux
> +  version_type=linux # correct to gnu/linux during the next big refactor
>    need_lib_prefix=no
>    need_version=no
>    hardcode_into_libs=yes
> @@ -2321,7 +2321,7 @@ beos*)
>    ;;
>  
>  bsdi[[45]]*)
> -  version_type=linux
> +  version_type=linux # correct to gnu/linux during the next big refactor
>    need_version=no
>    library_names_spec='${libname}${release}${shared_ext}$versuffix 
> ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>    soname_spec='${libname}${release}${shared_ext}$major'
> @@ -2460,7 +2460,7 @@ m4_if([$1], [],[
>    ;;
>  
>  dgux*)
> -  version_type=linux
> +  version_type=linux # correct to gnu/linux during the next big refactor
>    need_lib_prefix=no
>    need_version=no
>    library_names_spec='${libname}${release}${shared_ext}$versuffix 
> ${libname}${release}${shared_ext}$major $libname$shared_ext'
> @@ -2513,7 +2513,7 @@ freebsd* | dragonfly*)
>    ;;
>  
>  gnu*)
> -  version_type=linux
> +  version_type=linux # correct to gnu/linux during the next big refactor
>    need_lib_prefix=no
>    need_version=no
>    library_names_spec='${libname}${release}${shared_ext}$versuffix 
> ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
> @@ -2524,7 +2524,7 @@ gnu*)
>    ;;
>  
>  haiku*)
> -  version_type=linux
> +  version_type=linux # correct to gnu/linux during the next big refactor
>    need_lib_prefix=no
>    need_version=no
>    dynamic_linker="$host_os runtime_loader"
> @@ -2585,7 +2585,7 @@ hpux9* | hpux10* | hpux11*)
>    ;;
>  
>  interix[[3-9]]*)
> -  version_type=linux
> +  version_type=linux # correct to gnu/linux during the next big refactor
>    need_lib_prefix=no
>    need_version=no
>    library_names_spec='${libname}${release}${shared_ext}$versuffix 
> ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
> @@ -2601,7 +2601,7 @@ irix5* | irix6* | nonstopux*)
>      nonstopux*) version_type=nonstopux ;;
>      *)
>       if test "$lt_cv_prog_gnu_ld" = yes; then
> -             version_type=linux
> +                version_type=linux # correct to gnu/linux during the next 
> big refactor

Dito.

>       else
>               version_type=irix
>       fi ;;
> @@ -2640,7 +2640,7 @@ linux*oldld* | linux*aout* | linux*coff*)
>  
>  # This must be glibc/ELF.
>  linux* | k*bsd*-gnu | kopensolaris*-gnu)
> -  version_type=linux
> +  version_type=linux # correct to gnu/linux during the next big refactor
>    need_lib_prefix=no
>    need_version=no
>    library_names_spec='${libname}${release}${shared_ext}$versuffix 
> ${libname}${release}${shared_ext}$major $libname${shared_ext}'
> @@ -2703,7 +2703,7 @@ netbsd*)
>    ;;
>  
>  newsos6)
> -  version_type=linux
> +  version_type=linux # correct to gnu/linux during the next big refactor
>    library_names_spec='${libname}${release}${shared_ext}$versuffix 
> ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>    shlibpath_var=LD_LIBRARY_PATH
>    shlibpath_overrides_runpath=yes
> @@ -2772,7 +2772,7 @@ rdos*)
>    ;;
>  
>  solaris*)
> -  version_type=linux
> +  version_type=linux # correct to gnu/linux during the next big refactor
>    need_lib_prefix=no
>    need_version=no
>    library_names_spec='${libname}${release}${shared_ext}$versuffix 
> ${libname}${release}${shared_ext}$major $libname${shared_ext}'
> @@ -2797,7 +2797,7 @@ sunos4*)
>    ;;
>  
>  sysv4 | sysv4.3*)
> -  version_type=linux
> +  version_type=linux # correct to gnu/linux during the next big refactor
>    library_names_spec='${libname}${release}${shared_ext}$versuffix 
> ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>    soname_spec='${libname}${release}${shared_ext}$major'
>    shlibpath_var=LD_LIBRARY_PATH
> @@ -2821,7 +2821,7 @@ sysv4 | sysv4.3*)
>  
>  sysv4*MP*)
>    if test -d /usr/nec ;then
> -    version_type=linux
> +    version_type=linux # correct to gnu/linux during the next big refactor
>      library_names_spec='$libname${shared_ext}.$versuffix 
> $libname${shared_ext}.$major $libname${shared_ext}'
>      soname_spec='$libname${shared_ext}.$major'
>      shlibpath_var=LD_LIBRARY_PATH
> @@ -2852,7 +2852,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | 
> sysv4*uw2*)
>  
>  tpf*)
>    # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
> -  version_type=linux
> +  version_type=linux # correct to gnu/linux during the next big refactor
>    need_lib_prefix=no
>    need_version=no
>    library_names_spec='${libname}${release}${shared_ext}$versuffix 
> ${libname}${release}${shared_ext}$major $libname${shared_ext}'
> @@ -2862,7 +2862,7 @@ tpf*)
>    ;;
>  
>  uts4*)
> -  version_type=linux
> +  version_type=linux # correct to gnu/linux during the next big refactor
>    library_names_spec='${libname}${release}${shared_ext}$versuffix 
> ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>    soname_spec='${libname}${release}${shared_ext}$major'
>    shlibpath_var=LD_LIBRARY_PATH
> 
> 
> hooks/post-receive