[packages/libtool] - updated to 2.4.4 - updated linking-order patch - removed obsolete tests,gnulib patches

qboosh qboosh at pld-linux.org
Tue Dec 2 04:59:00 CET 2014


commit 95ca21bb101e3986927d85f1149f9112b386167c
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Dec 2 04:59:07 2014 +0100

    - updated to 2.4.4
    - updated linking-order patch
    - removed obsolete tests,gnulib patches

 libtool-gnulib.patch        | 32 --------------------------------
 libtool-linking-order.patch |  9 ---------
 libtool-tests.patch         | 11 -----------
 libtool.spec                | 14 ++++----------
 4 files changed, 4 insertions(+), 62 deletions(-)
---
diff --git a/libtool.spec b/libtool.spec
index 2bb8a62..d83de02 100644
--- a/libtool.spec
+++ b/libtool.spec
@@ -10,13 +10,13 @@ Summary(pt_BR.UTF-8):	GNU libtool, uma ferramenta de geração de bibliotecas co
 Summary(ru.UTF-8):	GNU libtool, набор утилит для генерации разделяемых библиотек
 Summary(uk.UTF-8):	GNU libtool, набір утиліт для генерації динамічних бібліотек
 Name:		libtool
-Version:	2.4.3
-Release:	2
+Version:	2.4.4
+Release:	1
 Epoch:		2
 License:	GPL v2+
 Group:		Development/Tools
 Source0:	http://ftp.gnu.org/gnu/libtool/%{name}-%{version}.tar.xz
-# Source0-md5:	b5699a6d58f5594cdb0992c5e1f5e57e
+# Source0-md5:	51bf400de3354687d68dfa2392506b7e
 Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-man-pages.tar.bz2
 # Source1-md5:	b95e215961860c66f0868b0d551358c9
 Patch0:		%{name}-info.patch
@@ -24,8 +24,6 @@ Patch1:		%{name}-libdirs.patch
 Patch2:		%{name}-multilib.patch
 Patch3:		%{name}-linking-order.patch
 Patch4:		%{name}-fuse-ld.patch
-Patch5:		%{name}-tests.patch
-Patch6:		%{name}-gnulib.patch
 URL:		http://www.gnu.org/software/libtool/
 BuildRequires:	/usr/bin/which
 BuildRequires:	autoconf >= 2.59
@@ -154,8 +152,6 @@ складу libltdl.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 %build
 %{__aclocal} -I m4
@@ -223,8 +219,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/libtool/README
 %{_datadir}/libtool/Makefile*
 %{_datadir}/libtool/aclocal.m4
-%{_datadir}/libtool/argz.c
-%{_datadir}/libtool/argz_.h
 %{_datadir}/libtool/config-h.in
 %attr(755,root,root) %{_datadir}/libtool/configure
 %{_datadir}/libtool/configure.ac
@@ -255,8 +249,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libltdl.so
 %{_libdir}/libltdl.la
 %{_includedir}/libltdl
+%{_aclocaldir}/ltargz.m4
 %{_includedir}/ltdl.h
-%{_aclocaldir}/argz.m4
 %{_aclocaldir}/ltdl.m4
 
 %files -n libltdl-static
diff --git a/libtool-gnulib.patch b/libtool-gnulib.patch
deleted file mode 100644
index 5d7c071..0000000
--- a/libtool-gnulib.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-These snippet/ headers are installed by gnulib, not libtool.  There's no
-reason libtool should be trying to delete these for us (and will break
-projects), so drop that logic.
-
-People who are using gnulib can use gnulib to update/manage these.
-
-* libtoolize.in (func_require_seen_libtool): Delete snippet/ header files
-from $all_pkgaux_files.
-
-Signed-off-by: Mike Frysinger <vapier at gentoo.org>
----
- libtoolize.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libtoolize.in b/libtoolize.in
-index d819470..d0cbfb0 100644
---- a/libtoolize.in
-+++ b/libtoolize.in
-@@ -1897,7 +1897,7 @@ func_require_seen_libtool ()
-   # Do not remove config.guess, config.sub or install-sh, we don't
-   # install them without --install, and the project may not be using
-   # Automake.
--  all_pkgaux_files="compile depcomp missing ltmain.sh snippet/_Noreturn.h snippet/arg-nonnull.h snippet/c++defs.h snippet/warn-on-use.h"
-+  all_pkgaux_files="compile depcomp missing ltmain.sh"
-   all_pkgmacro_files="argz.m4 libtool.m4 ltdl.m4 ltoptions.m4 ltsugar.m4 ltversion.in ltversion.m4 lt~obsolete.m4"
-   all_pkgltdl_files="COPYING.LIB Makefile Makefile.in Makefile.inc Makefile.am README acinclude.m4 aclocal.m4 argz_.h argz.c config.h.in config-h.in configure configure.ac configure.in libltdl/lt__alloc.h libltdl/lt__dirent.h libltdl/lt__glibc.h libltdl/lt__private.h libltdl/lt__strl.h libltdl/lt_dlloader.h libltdl/lt_error.h libltdl/lt_system.h libltdl/slist.h loaders/dld_link.c loaders/dlopen.c loaders/dyld.c loaders/load_add_on.c loaders/loadlibrary.c loaders/preopen.c loaders/shl_load.c lt__alloc.c lt__dirent.c lt__strl.c lt_dlloader.c lt_error.c ltdl.c ltdl.h ltdl.mk slist.c"
- 
--- 
-2.1.2
-
-
-
diff --git a/libtool-linking-order.patch b/libtool-linking-order.patch
index cc7b368..a950214 100644
--- a/libtool-linking-order.patch
+++ b/libtool-linking-order.patch
@@ -93,15 +93,6 @@
  	else
  	 # Determine the default libpath from the value encoded in an
  	 # empty executable.
-@@ -5296,7 +5296,7 @@
- 	  fi
- 	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
- 	  # This is similar to how AIX traditionally builds its shared libraries.
--	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $wl-bnoentry $compiler_flags $wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs $wl-bnoentry $wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- 	fi
-       fi
-       ;;
 @@ -5376,7 +5376,7 @@
  	# Tell ltmain to make .dll files, not .so files.
  	shrext_cmds=.dll
diff --git a/libtool-tests.patch b/libtool-tests.patch
deleted file mode 100644
index 1a35fe0..0000000
--- a/libtool-tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libtool-2.4.3/tests/cmdline_wrap.at~	2014-10-27 18:20:51.000000000 +0100
-+++ libtool-2.4.3/tests/cmdline_wrap.at	2014-10-30 22:37:17.938397654 +0100
-@@ -28,7 +28,7 @@
- AT_SETUP([Run tests with low max_cmd_len])
- AT_KEYWORDS([recursive expensive])
- dnl If we already have failures, then reruns will fail too!
--fail_list=`for f in ?/fail ??/fail ???/fail ????/fail; do echo $f; end`
-+fail_list=`for f in ?/fail ??/fail ???/fail ????/fail; do echo $f; done`
- AT_CHECK([test -z "$fail_list" || (exit 77)])
- m4_ifdef([AT_CAPTURE_FILE],
- [AT_CAPTURE_FILE([testsuite.log])])
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libtool.git/commitdiff/95ca21bb101e3986927d85f1149f9112b386167c



More information about the pld-cvs-commit mailing list