Re: FYI: 333-gary-refactor-LTDL_INIT.patch
* Ralf Wildenhues wrote on Tue, Jan 08, 2008 at 08:29:05PM CET: * Gary V. Vaughan wrote on Tue, Jan 08, 2008 at 05:23:24AM CET: On 8 Jan 2008, at 04:40, Ralf Wildenhues wrote: With this patch, I see in the log of make distcheck that the libltdl subdirectory is being configured. This is wrong, as libltdl in the Libtool package should be in nonrecursive mode rather than in subproject mode. This causes distcheck to fail. Can you fix this? I noticed this yesterday when I started the alpha release process too. Yes, I'll figure this out before I go any further. It is because _LTDL_SETUP calls _LTDL_MODE_DISPATCH which calls AC_CONFIG_SUBDIRS. That's wrong, no? Is that because implicitly subproject-libltdl mode is assumed for the Libtool package? OK to apply this fix (feeling a bit hackish, but does exactly what's needed)? Cheers, Ralf 2008-01-14 Ralf Wildenhues [EMAIL PROTECTED] * configure.ac: Set libltdl nonrecursive option, to avoid configuring libltdl inside the Libtool package. Index: configure.ac === RCS file: /cvsroot/libtool/libtool/configure.ac,v retrieving revision 1.79 diff -u -r1.79 configure.ac --- configure.ac6 Jan 2008 16:33:30 - 1.79 +++ configure.ac14 Jan 2008 19:24:05 - @@ -181,6 +181,7 @@ ## Libtool initialisation. ## ## --- ## LT_INIT([dlopen win32-dll]) +_LT_SET_OPTION([LTDL_INIT], [nonrecursive]) _LTDL_SETUP # Enable all the language support we can
Re: make -s
* Ralf Wildenhues wrote on Thu, Jan 10, 2008 at 08:29:33AM CET:
For whatever output is left done by libtool I expect that whoever want's
it silenced hard enough will have enough motivation to send a patch to
libtool-patches@gnu.org.
Since repeatedly nobody stepped forward to do this, I wrote that patch
myself now. OK to apply to HEAD?
Cheers,
Ralf
2008-01-14 Ralf Wildenhues [EMAIL PROTECTED]
Silence all non-warning output from `libtool --silent'.
* libltdl/config/ltmain.m4sh (func_generate_dlsyms)
(func_extract_archives, func_mode_link): Use func_verbose
instead of func_echo for all non-warning output.
Index: libltdl/config/ltmain.m4sh
===
RCS file: /cvsroot/libtool/libtool/libltdl/config/ltmain.m4sh,v
retrieving revision 1.95
diff -u -r1.95 ltmain.m4sh
--- libltdl/config/ltmain.m4sh 12 Jan 2008 13:58:14 - 1.95
+++ libltdl/config/ltmain.m4sh 14 Jan 2008 21:19:24 -
@@ -879,7 +879,7 @@
func_show_eval $RM $nlist ${nlist}S ${nlist}T
# Parse the name list into a source file.
- func_echo creating $output_objdir/$my_dlsyms
+ func_verbose creating $output_objdir/$my_dlsyms
$opt_dry_run || $ECHO $output_objdir/$my_dlsyms \
/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation.
*/
@@ -893,14 +893,14 @@
if test $dlself = yes; then
- func_echo generating symbol list for \`$output'
+ func_verbose generating symbol list for \`$output'
$opt_dry_run || echo ': @PROGRAM@ ' $nlist
# Add our own program objects to the symbol list.
progfiles=`$ECHO X$objs$old_deplibs | $SP2NL | $Xsed -e $lo2o |
$NL2SP`
for progfile in $progfiles; do
- func_echo extracting global C symbols from \`$progfile'
+ func_verbose extracting global C symbols from \`$progfile'
$opt_dry_run || eval $NM $progfile | $global_symbol_pipe
'$nlist'
done
@@ -947,7 +947,7 @@
fi
for dlprefile in $dlprefiles; do
- func_echo extracting global C symbols from \`$dlprefile'
+ func_verbose extracting global C symbols from \`$dlprefile'
func_basename $dlprefile
name=$func_basename_result
$opt_dry_run || {
@@ -1159,7 +1159,7 @@
case $host in
*-darwin*)
- func_echo Extracting $my_xabs
+ func_verbose Extracting $my_xabs
# Do not bother doing anything if just a dry run
$opt_dry_run || {
darwin_orig_dir=`pwd`
@@ -1171,7 +1171,7 @@
if test -n $darwin_arches; then
darwin_arches=`$ECHO $darwin_arches | $SED -e 's/.*are://'`
darwin_arch=
- func_echo $darwin_base_archive has multiple architectures
$darwin_arches
+ func_verbose $darwin_base_archive has multiple architectures
$darwin_arches
for darwin_arch in $darwin_arches ; do
func_mkdir_p unfat-$$/${darwin_base_archive}-${darwin_arch}
lipo -thin $darwin_arch -output
unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}
${darwin_archive}
@@ -4655,13 +4655,13 @@
# If the library has no export list, then create one now
if test -f $output_objdir/$soname-def; then :
else
- func_echo extracting exported symbol list from \`$soname'
+ func_verbose extracting exported symbol list from \`$soname'
func_execute_cmds $extract_expsyms_cmds 'exit $?'
fi
# Create $newlib
if test -f $output_objdir/$newlib; then :; else
- func_echo generating import library for \`$soname'
+ func_verbose generating import library for \`$soname'
func_execute_cmds $old_archive_from_expsyms_cmds 'exit $?'
fi
# make sure the library variables are pointing to the new library
@@ -5982,7 +5982,7 @@
# Prepare the list of exported symbols
if test -z $export_symbols; then
if test $always_export_symbols = yes || test -n
$export_symbols_regex; then
- func_echo generating symbol list for \`$libname.la'
+ func_verbose generating symbol list for \`$libname.la'
export_symbols=$output_objdir/$libname.exp
$opt_dry_run || $RM $export_symbols
cmds=$export_symbols_cmds
@@ -5996,7 +5996,7 @@
skipped_export=false
else
# The command line is too long to execute in one step.
- func_echo using reloadable object file for export list...
+ func_verbose using reloadable object file for export list...
skipped_export=:
# Break out early, otherwise skipped_export may be
# set to false by a later but shorter cmd.
@@ -6019,7 +6019,7 @@
if test X$skipped_export != X: test -n
Re: FYI: 333-gary-refactor-LTDL_INIT.patch
Hello Gary, I've applied this patch to fix an omission in your change. Cheers, Ralf 2008-01-14 Ralf Wildenhues [EMAIL PROTECTED] * libltdl/m4/ltoptions.m4 (AC_ENABLE_SHARED): Fix to use new _LT_SET_OPTION semantics. Index: libltdl/m4/ltoptions.m4 === RCS file: /cvsroot/libtool/libtool/libltdl/m4/ltoptions.m4,v retrieving revision 1.10 diff -u -r1.10 ltoptions.m4 --- libltdl/m4/ltoptions.m4 6 Jan 2008 16:33:31 - 1.10 +++ libltdl/m4/ltoptions.m4 14 Jan 2008 21:18:06 - @@ -188,7 +188,7 @@ # Old names: AC_DEFUN([AC_ENABLE_SHARED], -[_LT_SET_OPTION([shared]) +[_LT_SET_OPTION([LT_INIT], [shared]) ]) AC_DEFUN([AC_DISABLE_SHARED],
Re: make -s
Ralf Wildenhues wrote: * Ralf Wildenhues wrote on Thu, Jan 10, 2008 at 08:29:33AM CET: For whatever output is left done by libtool I expect that whoever want's it silenced hard enough will have enough motivation to send a patch to libtool-patches@gnu.org. Since repeatedly nobody stepped forward to do this, I wrote that patch myself now. OK to apply to HEAD? Yes. Thank you. Peter -- Peter O'Gorman http://pogma.com
withGCC unset
Hi,
This patch should fix issues with withGCC.
Ok for HEAD?
Peter
--
Peter O'Gorman
http://pogma.com
2008-01-14 Peter O'Gorman [EMAIL PROTECTED]
* libltdl/m4/libtool.m4: Set GCC var for every tag, avoids need
to set withGCC var.
Index: libltdl/m4/libtool.m4
===
RCS file: /sources/libtool/libtool/libltdl/m4/libtool.m4,v
retrieving revision 1.129
diff -u -r1.129 libtool.m4
--- libltdl/m4/libtool.m4 11 Jan 2008 19:15:08 - 1.129
+++ libltdl/m4/libtool.m4 14 Jan 2008 21:15:53 -
@@ -969,14 +969,6 @@
m4_defun([_LT_DARWIN_LINKER_FEATURES],
[
m4_require([_LT_REQUIRED_DARWIN_CHECKS])
- m4_case([$1],
- [C], [withGCC=$GCC],
- [CXX], [withGCC=$GXX],
- [F77], [withGCC=$G77],
- [FC], [withGCC=$ac_cv_fc_compiler_gnu],
- [GCJ], [withGCC=$GCC],
- [], [withGCC=$GCC],
- [withGCC=$GCC])
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_automatic, $1)=yes
@@ -984,7 +976,7 @@
_LT_TAGVAR(whole_archive_flag_spec, $1)=''
_LT_TAGVAR(link_all_deplibs, $1)=yes
_LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined
- if test $withGCC = yes; then
+ if test $GCC = yes; then
output_verbose_link_cmd=echo
_LT_TAGVAR(archive_cmds, $1)=\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}
_LT_TAGVAR(module_cmds, $1)=\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}
@@ -2034,14 +2026,9 @@
m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_DECL_SED])dnl
AC_MSG_CHECKING([dynamic linker characteristics])
-m4_case([$1],
- [C], [withGCC=$GCC],
- [CXX], [withGCC=$GXX],
- [F77], [withGCC=$G77],
- [FC], [withGCC=$ac_cv_fc_compiler_gnu],
- [GCJ], [withGCC=$GCC],
- [], [withGCC=$GCC
-if test $withGCC = yes; then
+m4_if([$1],
+ [], [
+if test $GCC = yes; then
case $host_os in
darwin*) lt_awk_arg=/^libraries:/,/LR/ ;;
*) lt_awk_arg=/^libraries:/ ;;
@@ -2091,8 +2078,7 @@
sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
else
sys_lib_search_path_spec=/lib /usr/lib /usr/local/lib
-fi],
-[withGCC=$GCC])
+fi])
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -2203,7 +2189,7 @@
need_version=no
need_lib_prefix=no
- case $withGCC,$host_os in
+ case $GCC,$host_os in
yes,cygwin* | yes,mingw* | yes,pw32*)
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
@@ -6572,11 +6558,12 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
+ lt_save_GCC=$GCC
CC=${F77-f77}
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
_LT_CC_BASENAME([$compiler])
-
+ GCC=$G77
if test -n $compiler; then
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
@@ -6624,6 +6611,7 @@
_LT_CONFIG($1)
fi # test -n $compiler
+ GCC=$lt_save_GCC
CC=$lt_save_CC
fi # test $_lt_disable_F77 != yes
@@ -6713,8 +6701,11 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
+ lt_save_GCC=$GCC
CC=${FC-f95}
compiler=$CC
+ GCC=$ac_cv_fc_compiler_gnu
+
_LT_TAGVAR(compiler, $1)=$CC
_LT_CC_BASENAME([$compiler])
@@ -6766,6 +6757,7 @@
_LT_CONFIG($1)
fi # test -n $compiler
+ GCC=$lt_save_GCC
CC=$lt_save_CC
fi # test $_lt_disable_FC != yes
@@ -6804,6 +6796,8 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
+lt_save_GCC=$GCC
+GCC=yes
CC=${GCJ-gcj}
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
@@ -6831,6 +6825,8 @@
fi
AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
CC=$lt_save_CC
])# _LT_LANG_GCJ_CONFIG
@@ -6866,6 +6862,8 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
+lt_save_GCC=$GCC
+GCC=
CC=${RC-windres}
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
@@ -6877,6 +6875,7 @@
_LT_CONFIG($1)
fi
+GCC=$lt_save_GCC
AC_LANG_RESTORE
CC=$lt_save_CC
])# _LT_LANG_RC_CONFIG
FYI: update `fetch' target
Hello, I've fixed the `fetch' target as below, in HEAD, and likewise in branch-1-5. Cheers, Ralf * Makefile.maint (fetch): Update to match upstream git sources. Pull `INSTALL' from gnulib instead of from Autoconf. Index: Makefile.maint === RCS file: /cvsroot/libtool/libtool/Makefile.maint,v retrieving revision 1.15 diff -u -r1.15 Makefile.maint --- Makefile.maint 25 Mar 2007 12:12:42 - 1.15 +++ Makefile.maint 14 Jan 2008 21:58:12 - @@ -118,7 +118,8 @@ ## Program to use to fetch files. WGET = wget -WGETSGO = $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~ +WGETSGO = $(WGET) 'http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~' +WGET_GIT = $(WGET) 'http://git.savannah.gnu.org/gitweb/?a=blob_plain;hb=HEAD;p=' ## Files that we fetch and which we compare against. ## FIXME should be a lot more here @@ -136,11 +137,11 @@ mkdir Fetchdir ## If a get fails then that is a problem. (cd Fetchdir \ - $(WGETSGO)/autoconf/autoconf/INSTALL; \ - $(WGETSGO)/automake/automake/lib/install-sh; \ - $(WGETSGO)/config/config/config.guess; \ - $(WGETSGO)/config/config/config.sub; \ - $(WGETSGO)/texinfo/texinfo/doc/texinfo.tex ) + $(WGET_GIT)'gnulib.git;f=doc/INSTALL' -O INSTALL \ + $(WGET_GIT)'automake.git;f=lib/install-sh' -O install-sh \ + $(WGETSGO)/config/config/config.guess -O config.guess \ + $(WGETSGO)/config/config/config.sub -O config.sub \ + $(WGETSGO)/texinfo/texinfo/doc/texinfo.tex -O texinfo.tex ) ## Don't exit after test because we want to give as many errors as ## possible. @stat=0; for file in $(FETCHFILES); do \
Re: FYI: 333-gary-refactor-LTDL_INIT.patch
Hi Gary, * Gary V. Vaughan wrote on Tue, Jan 15, 2008 at 03:22:07AM CET: On 15 Jan 2008, at 03:24, Ralf Wildenhues wrote: OK to apply this fix (feeling a bit hackish, but does exactly what's needed)? Absolutely. Sorry I didn't get to it sooner myself. I can't think of a cleaner way to tackle it myself off the top of my head, please go ahead and commit. Thanks, done. Expect a fix for the remaining fallout from 333 soon. Cheers, Ralf * configure.ac: Set libltdl nonrecursive option, to avoid configuring libltdl inside the Libtool package.
Re: FYI: 333-gary-refactor-LTDL_INIT.patch
Hallo Ralf, On 15 Jan 2008, at 14:24, Ralf Wildenhues wrote: Expect a fix for the remaining fallout from 333 soon. I thought this was the last thing? What else needs to be addressed before I can roll an alpha (excepting Peter's current work)? Cheers, Gary -- Gary V. Vaughan ([EMAIL PROTECTED]) PGP.sig Description: This is a digitally signed message part
