packages: libunwind/libunwind.spec, libunwind/libunwind-generic.patch (NEW)...

qboosh qboosh at pld-linux.org
Sun Sep 11 10:00:49 CEST 2011


Author: qboosh                       Date: Sun Sep 11 08:00:49 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.0
- dropped outdated disable-setjmp patch, added workaround for tricks vs glibc redirections
- added generic patch to fix libunwind-generic.so symlink creation
- more archs supported (arm mips ppc)

---- Files affected:
packages/libunwind:
   libunwind.spec (1.15 -> 1.16) , libunwind-generic.patch (NONE -> 1.1)  (NEW), libunwind-disable-setjmp.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/libunwind/libunwind.spec
diff -u packages/libunwind/libunwind.spec:1.15 packages/libunwind/libunwind.spec:1.16
--- packages/libunwind/libunwind.spec:1.15	Wed Sep 15 20:37:34 2010
+++ packages/libunwind/libunwind.spec	Sun Sep 11 10:00:44 2011
@@ -1,27 +1,33 @@
 # $Revision$, $Date$
-%bcond_with 	tests
+#
+# Conditional build:
+%bcond_with 	tests	# perform "make check" (fails randomly)
+#
 Summary:	libunwind - a (mostly) platform-independent unwind API
 Summary(pl.UTF-8):	libunwind - (prawie) niezależne od platformy API do rozwijania
 Name:		libunwind
-Version:	0.99
-Release:	2
+Version:	1.0
+Release:	1
 License:	MIT
 Group:		Libraries
 Source0:	http://download.savannah.gnu.org/releases/libunwind/%{name}-%{version}.tar.gz
-# Source0-md5:	3e9ca08118e22165a7f07d01d61a2d0d
-Patch0:		%{name}-disable-setjmp.patch
-Patch1:		%{name}-rpath.patch
+# Source0-md5:	7308c793c9a1fd7be6fa2c070438c516
+Patch0:		%{name}-rpath.patch
+Patch1:		%{name}-generic.patch
 URL:		http://www.nongnu.org/libunwind/
-BuildRequires:  autoconf
-BuildRequires:  automake >= 1.6
+BuildRequires:	autoconf
+BuildRequires:	automake >= 1.6
 %ifarch %{x8664}
 BuildRequires:	binutils >= 2:2.15.94.0.2.2
 %endif
-BuildRequires:  libtool
+BuildRequires:	libtool
 BuildRequires:	rpmbuild(macros) >= 1.213
-ExclusiveArch:	%{ix86} %{x8664} hppa ia64
+ExclusiveArch:	%{ix86} %{x8664} arm hppa ia64 mips ppc ppc64
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# some setjmp tricks expect non-redirected functions
+%define		filterout_cpp	-D_FORTIFY_SOURCE=[0-9]+
+
 # x86/x86_64/hppa/ia64
 %ifarch	%{ix86}
 %define	asuf	x86
@@ -77,8 +83,9 @@
 %{__autoconf}
 %{__autoheader}
 %{__automake}
+# what needs additional -fPIC? libtool already uses it for shared objects
 %configure \
-	CPPFLAGS="%{rpmcppflags} -fPIC"
+	CFLAGS="%{rpmcflags} -fPIC"
 %{__make}
 
 %{?with_tests:%{__make} check}
@@ -100,6 +107,8 @@
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
 %attr(755,root,root) %{_libdir}/libunwind.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libunwind.so.7
+%attr(755,root,root) %{_libdir}/libunwind-setjmp.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libunwind-setjmp.so.0
 %attr(755,root,root) %{_libdir}/libunwind-%{asuf}.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libunwind-%{asuf}.so.7
 
@@ -107,8 +116,10 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libunwind.so
 %attr(755,root,root) %{_libdir}/libunwind-generic.so
+%attr(755,root,root) %{_libdir}/libunwind-setjmp.so
 %attr(755,root,root) %{_libdir}/libunwind-%{asuf}.so
 %{_libdir}/libunwind.la
+%{_libdir}/libunwind-setjmp.la
 %{_libdir}/libunwind-%{asuf}.la
 # static-only
 %{_libdir}/libunwind-ptrace.a
@@ -122,6 +133,7 @@
 %defattr(644,root,root,755)
 %{_libdir}/libunwind.a
 %{_libdir}/libunwind-generic.a
+%{_libdir}/libunwind-setjmp.a
 %{_libdir}/libunwind-%{asuf}.a
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -130,6 +142,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2011/09/11 08:00:44  qboosh
+- updated to 1.0
+- dropped outdated disable-setjmp patch, added workaround for tricks vs glibc redirections
+- added generic patch to fix libunwind-generic.so symlink creation
+- more archs supported (arm mips ppc)
+
 Revision 1.15  2010/09/15 18:37:34  arekm
 - rel 2; rebuild with fPIC
 

================================================================
Index: packages/libunwind/libunwind-generic.patch
diff -u /dev/null packages/libunwind/libunwind-generic.patch:1.1
--- /dev/null	Sun Sep 11 10:00:49 2011
+++ packages/libunwind/libunwind-generic.patch	Sun Sep 11 10:00:44 2011
@@ -0,0 +1,11 @@
+--- libunwind-1.0/src/Makefile.am.orig	2011-08-28 06:58:20.000000000 +0200
++++ libunwind-1.0/src/Makefile.am	2011-09-11 07:52:45.723337644 +0200
+@@ -332,7 +332,7 @@
+ #
+ install-exec-hook:
+ 	$(LN_S) -f libunwind-$(arch).a  $(DESTDIR)$(libdir)/libunwind-generic.a
+-	if test -f $(DESTDIR)$(libdir)/libunwind-generic.so; then \
++	if test -f $(DESTDIR)$(libdir)/libunwind-$(arch).so; then \
+ 	    $(LN_S) -f libunwind-$(arch).so \
+ 		$(DESTDIR)$(libdir)/libunwind-generic.so; \
+ 	fi
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libunwind/libunwind.spec?r1=1.15&r2=1.16&f=u



More information about the pld-cvs-commit mailing list