[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: darwin.4.diff
From: |
Robert Boehne |
Subject: |
Re: darwin.4.diff |
Date: |
Sat, 22 Mar 2003 00:34:09 -0600 |
Approved & commited. Like I should be. ;)
Peter O'Gorman wrote:
>
> Hello again,
> inline and attached.
> Thanks,
> Peter
>
> Index: ChangeLog
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/ChangeLog,v
> retrieving revision 1.1207
> diff -u -d -b -w -r1.1207 ChangeLog
> --- ChangeLog 20 Mar 2003 20:24:20 -0000 1.1207
> +++ ChangeLog 21 Mar 2003 15:22:07 -0000
> @@ -1,3 +1,14 @@
> +2003-03-21 Peter O'Gorman <address@hidden>
> +
> + * README: Remove "Important" information about patching automake.
> + * configure.ac: Fix misapplied patch in last commit
> + * libtool.m4 (darwin): Check compiler is apple gcc, add -single_module
> + support so that dyloading c++ shared libraries will work.
> + * libtool.m4 (_LT_AC_TAGCONFIG): Add test -n to the tests so that
> + it will work outside of libtool.
> + * doc/PLATFORMS: Add darwin
> + * f77demo/configure.ac: Add config.h which was misapplied previously.
> +
> 2003-03-20 Peter O'Gorman <address@hidden>
>
> * ltmain.in: Always use $echo not echo for consistency.
> Index: README
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/README,v
> retrieving revision 1.16
> diff -u -d -b -w -r1.16 README
> --- README 28 Feb 2003 02:57:07 -0000 1.16
> +++ README 21 Mar 2003 15:22:07 -0000
> @@ -2,14 +2,6 @@
> the complexity of using shared libraries behind a consistent, portable
> interface.
>
> -IMPORTANT:
> -==========
> -
> -** Until the next release of automake, you should apply the patch at **
> -** the end of this file to your installed automake script if you **
> -** intend to use it in conjunction with this release of libtool. **
> -
> -
> To use libtool, add the new generic library building commands to your
> Makefile, Makefile.in, or Makefile.am. See the documentation for
> details.
> @@ -139,14 +131,3 @@
> `1.3.4' is the fourth patch release after stable release `1.3';
> `1.3b' is the first alpha release after stable release `1.3'.
>
> ---- /usr/bin/automake Sat Mar 11 09:25:33 2000
> -+++ automake Thu Sep 7 22:08:33 2000
> -@@ -187,7 +187,7 @@ $seen_libtool = 0;
> - $libtool_line = 0;
> -
> - # Files installed by libtoolize.
> address@hidden = ('ltconfig', 'ltmain.sh', 'config.guess',
> 'config.sub');
> address@hidden = ('ltmain.sh', 'config.guess', 'config.sub');
> -
> - # TRUE if we've seen AM_MAINTAINER_MODE.
> - $seen_maint_mode = 0;
> Index: configure.ac
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/configure.ac,v
> retrieving revision 1.13
> diff -u -d -b -w -r1.13 configure.ac
> --- configure.ac 20 Mar 2003 20:24:21 -0000 1.13
> +++ configure.ac 21 Mar 2003 15:22:07 -0000
> @@ -53,7 +53,6 @@
> ## Automake Initialisation. ##
> ## ------------------------ ##
> AM_INIT_AUTOMAKE(AC_PACKAGE_TARNAME, AC_PACKAGE_VERSION)
> -AM_CONFIG_HEADER([config.h:config-h.in])
>
> ## ------------------------------- ##
> Index: libtool.m4
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/libtool.m4,v
> retrieving revision 1.310
> diff -u -d -b -w -r1.310 libtool.m4
> --- libtool.m4 20 Mar 2003 20:24:21 -0000 1.310
> +++ libtool.m4 21 Mar 2003 15:22:09 -0000
> @@ -1275,7 +1275,9 @@
> shlibpath_var=DYLD_LIBRARY_PATH
> shrext='$(test .$module = .yes && echo .so || echo .dylib)'
> # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the
> same.
> + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
> sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n"
> "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" |
> grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e
> "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
> + fi
> sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
> ;;
>
> @@ -1648,7 +1650,7 @@
>
> case $tagname in
> CXX)
> - if test "X$CXX" != "Xno"; then
> + if test -n "$CXX" && test "X$CXX" != "Xno"; then
> AC_LIBTOOL_LANG_CXX_CONFIG
> else
> tagname=""
> @@ -1656,7 +1658,7 @@
> ;;
>
> F77)
> - if test "X$F77" != "Xno"; then
> + if test -n "$F77" && test "X$F77" != "Xno"; then
> AC_LIBTOOL_LANG_F77_CONFIG
> else
> tagname=""
> @@ -1664,7 +1666,7 @@
> ;;
>
> GCJ)
> - if test "X$GCJ" != "Xno"; then
> + if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
> AC_LIBTOOL_LANG_GCJ_CONFIG
> else
> tagname=""
> @@ -1681,8 +1683,10 @@
> esac
>
> # Append the new tag name to the list of available tags.
> + if test -n "$tagname" ; then
> available_tags="$available_tags $tagname"
> fi
> + fi
> done
> IFS="$lt_save_ifs"
>
> @@ -2545,6 +2549,7 @@
> fi
> ;;
> darwin* | rhapsody*)
> + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
> _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
> case "$host_os" in
> rhapsody* | darwin1.[[012]])
> @@ -2558,12 +2563,13 @@
> # cross-compilation, but unfortunately the echo tests do not
> # yet detect zsh echo's removal of \ escapes. Also zsh
> mangles
> # `"' quotes if we put them in here... so don't!
> + output_verbose_link_cmd='echo'
> _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib
> $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags
> -install_name $rpath/$soname $verstring'
> _LT_AC_TAGVAR(module_cmds, $1)='$CC -bundle $allow_undefined_flag
> -o $lib $libobjs $deplibs$compiler_flags'
> # Don't fix this by using the ld -exported_symbols_list flag, it
> doesn't exist in older darwin ld's
> if test -z ${ZSH_VERSION} ; then
> - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e
> "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols >
> $output_objdir/${libname}-symbols.expsym && $CC -dynamiclib
> $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags
> -install_name $rpath/$soname $verstring && nmedit -s
> $output_objdir/${libname}-symbols.expsym ${lib}'
> - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[
> ]*,," -e "s,^\(..*\),_&," < $export_symbols >
> $output_objdir/${libname}-symbols.expsym && $CC -bundle
> $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags &&
> nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
> + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e
> "s,^[
> ]*,," -e "s,^\(..*\),_&," < $export_symbols >
> $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib
> $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags
> -install_name $rpath/$soname $verstring~nmedit -s
> $output_objdir/${libname}-symbols.expsym ${lib}'
> + _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e
> "s,^[
> ]*,," -e "s,^\(..*\),_&," < $export_symbols >
> $output_objdir/${libname}-symbols.expsym~$CC -bundle
> $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit
> -s $output_objdir/${libname}-symbols.expsym ${lib}'
> else
> #just in case a default was set somewhere
> _LT_AC_TAGVAR(archive_expsym_cmds, $1)=''
> @@ -2574,6 +2580,7 @@
> _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
> _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
> _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
> + fi
> ;;
> esac
> AC_MSG_RESULT([$enable_shared])
> @@ -2876,6 +2883,7 @@
> ;;
>
> darwin* | rhapsody*)
> + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
> _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
> case "$host_os" in
> rhapsody* | darwin1.[[012]])
> @@ -2885,22 +2893,37 @@
> test -z ${LD_TWOLEVEL_NAMESPACE} &&
> _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined
> suppress'
> ;;
> esac
> - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load
> -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs $deplibs &&
> $CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o
> $compiler_flags -install_name $rpath/$soname $verstring'
> + lt_int_apple_cc_single_mod=no
> + output_verbose_link_cmd='echo'
> + if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
> + lt_int_apple_cc_single_mod=yes
> + fi
> + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
> + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module
> $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags
> -install_name $rpath/$soname $verstring'
> + else
> + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load
> -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC
> -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs
> $compiler_flags -install_name $rpath/$soname $verstring'
> + fi
> _LT_AC_TAGVAR(module_cmds, $1)='$CC -bundle ${wl}-bind_at_load
> $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
>
> # Don't fix this by using the ld -exported_symbols_list flag, it
> doesn't exist in older darwin ld's
> if test -z ${ZSH_VERSION} ; then
> - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e
> "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols >
> $output_objdir/${libname}-symbols.expsym && $CC -r ${wl}-bind_at_load
> -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs $deplibs &&
> $CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o
> $compiler_flags -install_name $rpath/$soname $verstring && nmedit -s
> $output_objdir/${libname}-symbols.expsym ${lib}'
> - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e
> "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols >
> $output_objdir/${libname}-symbols.expsym && $CC -bundle
> $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags &&
> nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
> + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
> + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e
> "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols >
> $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module
> $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags
> -install_name $rpath/$soname $verstring~nmedit -s
> $output_objdir/${libname}-symbols.expsym ${lib}'
> + else
> + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e
> "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols >
> $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load
> -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC
> -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs
> $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s
> $output_objdir/${libname}-symbols.expsym ${lib}'
> + fi
> + _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e
> "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols >
> $output_objdir/${libname}-symbols.expsym~$CC -bundle
> $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit
> -s $output_objdir/${libname}-symbols.expsym ${lib}'
> else
> #just in case a default was set somewhere
> _LT_AC_TAGVAR(archive_expsym_cmds, $1)=''
> + _LT_AC_TAGVAR(module_expsym_cmds, $1)=''
> fi
> _LT_AC_TAGVAR(hardcode_direct, $1)=no
> _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
> _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
> _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
> _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
> + fi
> ;;
>
> dgux*)
> @@ -5309,6 +5332,7 @@
> ;;
>
> darwin* | rhapsody*)
> + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
> _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
> case "$host_os" in
> rhapsody* | darwin1.[[012]])
> @@ -5322,13 +5346,25 @@
> # cross-compilation, but unfortunately the echo tests do
> not
> # yet detect zsh echo's removal of \ escapes. Also zsh
> mangles
> # `"' quotes if we put them in here... so don't!
> - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load
> -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs $deplibs &&
> $CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o
> $compiler_flags -install_name $rpath/$soname $verstring'
> + lt_int_apple_cc_single_mod=no
> + output_verbose_link_cmd='echo'
> + if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
> + lt_int_apple_cc_single_mod=yes
> + fi
> + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
> + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module
> $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags
> -install_name $rpath/$soname $verstring'
> + else
> + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load
> -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC
> -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs
> $compiler_flags -install_name $rpath/$soname $verstring'
> + fi
> _LT_AC_TAGVAR(module_cmds, $1)='$CC -bundle ${wl}-bind_at_load
> $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
> -
> # Don't fix this by using the ld -exported_symbols_list flag, it
> doesn't exist in older darwin ld's
> if test -z ${ZSH_VERSION} ; then
> - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e
> "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols >
> $output_objdir/${libname}-symbols.expsym && $CC -r ${wl}-bind_at_load
> -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs $deplibs &&
> $CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o
> $compiler_flags -install_name $rpath/$soname $verstring && nmedit -s
> $output_objdir/${libname}-symbols.expsym ${lib}'
> - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e
> "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols >
> $output_objdir/${libname}-symbols.expsym && $CC -bundle
> $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags &&
> nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
> + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
> + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e
> "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols >
> $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module
> $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags
> -install_name $rpath/$soname $verstring~nmedit -s
> $output_objdir/${libname}-symbols.expsym ${lib}'
> + else
> + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e
> "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols >
> $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load
> -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC
> -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs
> $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s
> $output_objdir/${libname}-symbols.expsym ${lib}'
> + fi
> + _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e
> "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols >
> $output_objdir/${libname}-symbols.expsym~$CC -bundle
> $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags~nmedit
> -s $output_objdir/${libname}-symbols.expsym ${lib}'
> else
> #just in case a default was set somewhere
> _LT_AC_TAGVAR(archive_expsym_cmds, $1)=''
> @@ -5339,6 +5375,7 @@
> _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
> _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load
> $convenience'
> _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
> + fi
> ;;
>
> dgux*)
> Index: doc/PLATFORMS
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/doc/PLATFORMS,v
> retrieving revision 1.42
> diff -u -d -b -w -r1.42 PLATFORMS
> --- doc/PLATFORMS 24 Apr 2001 18:07:31 -0000 1.42
> +++ doc/PLATFORMS 21 Mar 2003 15:22:09 -0000
> @@ -112,6 +112,8 @@
> mips-sni-sysv4 gcc 1.3.5 ok
> (gcc-2.7.2.3, GNU assembler 2.8.1, native ld)
> mipsel-unknown-openbsd2.1 gcc 1.0 ok
> +powerpc-apple-darwin6.4 gcc 1.5 ok
> +(apple dev tools released 12/2002)
> powerpc-ibm-aix4.3.1.0 gcc 1.2f ok
> (egcs-1.1.1)
> powerpc-ibm-aix4.2.1.0 gcc 1.2f ok
> Index: f77demo/configure.ac
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/f77demo/configure.ac,v
> retrieving revision 1.1
> diff -u -d -b -w -r1.1 configure.ac
> --- f77demo/configure.ac 31 Jul 2002 20:15:27 -0000 1.1
> +++ f77demo/configure.ac 21 Mar 2003 15:22:09 -0000
> @@ -28,6 +28,7 @@
> ## Automake Initialisation. ##
> ## ------------------------ ##
> AM_INIT_AUTOMAKE(AC_PACKAGE_TARNAME, AC_PACKAGE_VERSION)
> +AM_CONFIG_HEADER([config.h:config-h.in])
>
> ## ------------------ ##
>
> ------------------------------------------------------------------------
> Name: darwin.4.patch.gz
> darwin.4.patch.gz Type: application/x-gzip
> Encoding: base64
>
> ------------------------------------------------------------------------
>
> ------------------------------------------------------------------------
> _______________________________________________
> Libtool-patches mailing list
> address@hidden
> http://mail.gnu.org/mailman/listinfo/libtool-patches