packages: libtool/libtool-info.patch, libtool/libtool-linking-order.patch, ...
qboosh
qboosh at pld-linux.org
Sun Jun 13 14:39:06 CEST 2010
Author: qboosh Date: Sun Jun 13 12:39:06 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 2.2.10
- updated info,linking-order patches
- removed obsolete crossmingw32 patch
- use libtool(1) and libtoolize(1) man pages which come from upstream
- release 0.1 (requires some testing)
---- Files affected:
packages/libtool:
libtool-info.patch (1.2 -> 1.3) , libtool-linking-order.patch (1.5 -> 1.6) , libtool.spec (1.192 -> 1.193) , libtool-crossmingw32.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/libtool/libtool-info.patch
diff -u packages/libtool/libtool-info.patch:1.2 packages/libtool/libtool-info.patch:1.3
--- packages/libtool/libtool-info.patch:1.2 Sun Sep 12 22:45:42 1999
+++ packages/libtool/libtool-info.patch Sun Jun 13 14:39:00 2010
@@ -1,8 +1,7 @@
-diff -Nru libtool-1.2d/doc/libtool.texi libtool-1.2d.new/doc/libtool.texi
---- libtool-1.2d/doc/libtool.texi Wed Dec 16 05:02:59 1998
-+++ libtool-1.2d.new/doc/libtool.texi Thu Dec 31 15:44:39 1998
-@@ -10,14 +10,10 @@
- @set BUGADDR the libtool mailing list @email{bug-libtool@@gnu.org}
+--- libtool-2.2.10/doc/libtool.texi.orig 2010-06-07 12:22:12.000000000 +0200
++++ libtool-2.2.10/doc/libtool.texi 2010-06-13 12:48:37.030208254 +0200
+@@ -11,16 +11,11 @@
+ @set MAILLIST the Libtool mailing list @email{libtool@@gnu.org}
@set objdir .libs
- at dircategory GNU programming tools
@@ -13,9 +12,82 @@
-
- at dircategory Individual utilities
- at direntry
+-* libtool-invocation: (libtool)Invoking libtool.
+- Running the @code{libtool} script.
-* libtoolize: (libtool)Invoking libtoolize. Adding libtool support.
+* Libtool: (libtool). Generic shared library support script
++* libtool-invocation: (libtool)libtool. Running the @code{libtool} script
+* libtoolize: (libtool)libtoolize. Adding libtool support
@end direntry
- @ifinfo
+ @ifnottex
+@@ -86,7 +81,7 @@
+ * Introduction:: What the heck is libtool?
+ * Libtool paradigm:: How libtool's view of libraries is different.
+ * Using libtool:: Example of using libtool to build libraries.
+-* Invoking libtool:: Running the @code{libtool} script.
++* libtool:: Running the @code{libtool} script.
+ * Integrating libtool:: Using libtool in your own packages.
+ * Other languages:: Using libtool without a C compiler.
+ * Versioning:: Using library interface versions.
+@@ -151,7 +146,7 @@
+
+ Including libtool in your package
+
+-* Invoking libtoolize:: @code{libtoolize} command line options.
++* libtoolize:: @code{libtoolize} command line options.
+ * Autoconf and LTLIBOBJS:: Autoconf automates LTLIBOBJS generation.
+
+ Using libtool with other languages
+@@ -1173,7 +1168,7 @@
+ creating a standalone binary. Use libtool to do the linking and add the
+ @option{-all-static} flag.
+
+- at node Invoking libtool
++ at node libtool
+ @chapter Invoking @command{libtool}
+ @pindex libtool
+ @cindex libtool command options
+@@ -2349,8 +2344,8 @@
+ @end defmac
+
+ @pindex aclocal
+-When you invoke the @command{libtoolize} program (@pxref{Invoking
+-libtoolize}), it will tell you where to find a definition of
++When you invoke the @command{libtoolize} program (@pxref{libtoolize}),
++it will tell you where to find a definition of
+ @code{LT_INIT}. If you use Automake, the @command{aclocal} program
+ will automatically add @code{LT_INIT} support to your
+ @file{configure} script when it sees the invocation of @code{LT_INIT}
+@@ -2407,11 +2402,11 @@
+ copying these files into your package.
+
+ @menu
+-* Invoking libtoolize:: @code{libtoolize} command line options.
++* libtoolize:: @code{libtoolize} command line options.
+ * Autoconf and LTLIBOBJS:: Autoconf automates LTLIBOBJS generation.
+ @end menu
+
+- at node Invoking libtoolize
++ at node libtoolize
+ @subsection Invoking @command{libtoolize}
+ @pindex libtoolize
+ @cindex libtoolize command options
+@@ -2761,7 +2756,7 @@
+ a tag, then it defaults to the configuration for the @code{C} language.
+
+ The tag can also be specified using @command{libtool}'s
+- at option{--tag=@var{tag}} option (@pxref{Invoking libtool}). It is a good
++ at option{--tag=@var{tag}} option (@pxref{libtool}). It is a good
+ idea to do so in @file{Makefile} rules, because that will allow users to
+ substitute the compiler without relying on @command{libtool} inference
+ heuristics. When no tag is specified, @command{libtool} will default
+@@ -4598,7 +4593,7 @@
+ @defmac LT_CONFIG_LTDL_DIR (@var{DIRECTORY})
+ Declare @var{DIRECTORY} to be the location of the @code{libltdl}
+ source files, for @command{libtoolize --ltdl} to place
+-them. @xref{Invoking libtoolize}, for more details. Provided that you
++them. @xref{libtoolize}, for more details. Provided that you
+ add an appropriate @code{LT_CONFIG_LTDL_DIR} call in your
+ @file{configure.ac} before calling @command{libtoolize}, the
+ appropriate @code{libltdl} files will be installed automatically.
================================================================
Index: packages/libtool/libtool-linking-order.patch
diff -u packages/libtool/libtool-linking-order.patch:1.5 packages/libtool/libtool-linking-order.patch:1.6
--- packages/libtool/libtool-linking-order.patch:1.5 Thu Mar 13 21:01:52 2008
+++ packages/libtool/libtool-linking-order.patch Sun Jun 13 14:39:00 2010
@@ -1,6 +1,6 @@
---- libtool-2.2/libltdl/m4/libtool.m4.orig 2008-03-08 16:27:45.500328028 +0100
-+++ libtool-2.2/libltdl/m4/libtool.m4 2008-03-08 16:52:29.192878848 +0100
-@@ -4306,7 +4306,7 @@
+--- libtool-2.2.10/libltdl/m4/libtool.m4.orig 2010-06-13 12:49:26.358213283 +0200
++++ libtool-2.2.10/libltdl/m4/libtool.m4 2010-06-13 13:00:32.278208254 +0200
+@@ -4443,7 +4443,7 @@
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
@@ -9,7 +9,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -4315,7 +4315,7 @@
+@@ -4452,7 +4452,7 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -18,7 +18,7 @@
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -4374,13 +4374,13 @@
+@@ -4524,13 +4524,13 @@
*Sun\ F*) # Sun Fortran 8.3
tmp_sharedflag='-G' ;;
esac
@@ -34,7 +34,7 @@
fi
case $cc_basename in
-@@ -4408,8 +4408,8 @@
+@@ -4558,8 +4558,8 @@
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
else
@@ -45,7 +45,7 @@
fi
;;
-@@ -4427,8 +4427,8 @@
+@@ -4577,8 +4577,8 @@
_LT_EOF
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -56,7 +56,7 @@
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -4474,8 +4474,8 @@
+@@ -4624,8 +4624,8 @@
*)
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -67,16 +67,16 @@
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -4654,7 +4654,7 @@
+@@ -4817,7 +4817,7 @@
# Tell ltmain to make .dll files, not .so files.
shrext_cmds=".dll"
# FIXME: Setting linknames here is a bad hack.
-- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $compiler_flags $libobjs `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
++ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $compiler_flags $libobjs `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
# The linker will automatically build a .lib file if we build a DLL.
_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
# FIXME: Should let the user specify the lib program.
-@@ -4698,7 +4698,7 @@
+@@ -4861,7 +4861,7 @@
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
freebsd* | dragonfly*)
@@ -85,7 +85,7 @@
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -4838,8 +4838,8 @@
+@@ -5008,8 +5008,8 @@
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -96,7 +96,7 @@
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
else
-@@ -4902,7 +4902,7 @@
+@@ -5072,7 +5072,7 @@
_LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
if test "$GCC" = yes; then
wlarc='${wl}'
@@ -105,7 +105,7 @@
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
$CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
else
-@@ -5400,8 +5400,8 @@
+@@ -5558,8 +5558,8 @@
# Check if GNU C++ uses GNU ld as the underlying linker, since the
# archiving commands below assume that GNU ld is being used.
if test "$with_gnu_ld" = yes; then
@@ -116,7 +116,7 @@
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -5427,7 +5427,7 @@
+@@ -5585,7 +5585,7 @@
# linker, instead of GNU ld. If possible, this setting should
# overridden to take advantage of the native linker features on
# the platform it is being used on.
@@ -125,7 +125,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -5598,7 +5598,7 @@
+@@ -5763,7 +5763,7 @@
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
@@ -134,7 +134,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -5607,7 +5607,7 @@
+@@ -5772,7 +5772,7 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -143,7 +143,7 @@
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -5817,8 +5817,8 @@
+@@ -5987,8 +5987,8 @@
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
@@ -154,7 +154,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -5844,16 +5844,16 @@
+@@ -6014,16 +6014,16 @@
# earlier do not add the objects themselves.
case `$CC -V 2>&1` in
*"Version 7."*)
@@ -175,7 +175,7 @@
;;
esac
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-@@ -5895,8 +5895,8 @@
+@@ -6065,8 +6065,8 @@
;;
cxx*)
# Compaq C++
@@ -186,7 +186,7 @@
runpath_var=LD_RUN_PATH
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -5916,12 +5916,12 @@
+@@ -6086,12 +6086,12 @@
# IBM XL 8.0 on PPC, with GNU ld
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -201,7 +201,7 @@
fi
;;
*)
-@@ -6000,10 +6000,10 @@
+@@ -6170,10 +6170,10 @@
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
@@ -214,16 +214,16 @@
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
_LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
fi
-@@ -6076,7 +6076,7 @@
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+@@ -6246,7 +6246,7 @@
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
;;
*)
-- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
;;
esac
-@@ -6163,9 +6163,9 @@
+@@ -6333,9 +6333,9 @@
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
if $CC --version | $GREP -v '^2\.7' > /dev/null; then
@@ -235,7 +235,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -6174,9 +6174,9 @@
+@@ -6344,9 +6344,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
================================================================
Index: packages/libtool/libtool.spec
diff -u packages/libtool/libtool.spec:1.192 packages/libtool/libtool.spec:1.193
--- packages/libtool/libtool.spec:1.192 Fri Apr 16 15:40:11 2010
+++ packages/libtool/libtool.spec Sun Jun 13 14:39:00 2010
@@ -6,13 +6,13 @@
Summary(ru.UTF-8): GNU libtool, набор утилит для генерации разделяемых библиотек
Summary(uk.UTF-8): GNU libtool, набір утиліт для генерації динамічних бібліотек
Name: libtool
-Version: 2.2.6
-Release: 13
+Version: 2.2.10
+Release: 0.1
Epoch: 2
License: GPL v2+
Group: Development/Tools
-Source0: http://ftp.gnu.org/gnu/libtool/%{name}-%{version}b.tar.lzma
-# Source0-md5: a4b36980765003b47dd75ac9429f4f11
+Source0: http://ftp.gnu.org/gnu/libtool/%{name}-%{version}.tar.lzma
+# Source0-md5: 2eba13ecd07653d0e34d4efe8e2974d8
Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-man-pages.tar.bz2
# Source1-md5: b95e215961860c66f0868b0d551358c9
Patch0: %{name}-info.patch
@@ -20,7 +20,6 @@
Patch2: %{name}-libdirs.patch
Patch3: %{name}-multilib.patch
Patch4: %{name}-linking-order.patch
-Patch5: %{name}-crossmingw32.patch
URL: http://www.gnu.org/software/libtool/
BuildRequires: /usr/bin/which
BuildRequires: autoconf >= 2.59
@@ -139,14 +138,13 @@
складу libltdl.
%prep
-%setup -q -c -T -a1 -n %{name}-%{version}b
+%setup -q -c -T
lzma -dc %{SOURCE0} | tar xf - -C ..
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
%build
%{__aclocal} -I libltdl/m4
@@ -170,10 +168,10 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
+# decompress only "ja" manuals; English ones are back in upstream
+bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir} ja
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-rm $RPM_BUILD_ROOT%{_mandir}/README.libtool-man-pages
%clean
rm -rf $RPM_BUILD_ROOT
@@ -242,6 +240,13 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.193 2010/06/13 12:39:00 qboosh
+- updated to 2.2.10
+- updated info,linking-order patches
+- removed obsolete crossmingw32 patch
+- use libtool(1) and libtoolize(1) man pages which come from upstream
+- release 0.1 (requires some testing)
+
Revision 1.192 2010/04/16 13:40:11 arekm
- release 13
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libtool/libtool-info.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libtool/libtool-linking-order.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libtool/libtool.spec?r1=1.192&r2=1.193&f=u
More information about the pld-cvs-commit
mailing list