From 170f4373f579beb17de049b312d5956fbaae5194 Mon Sep 17 00:00:00 2001
From: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: May 09 2011 15:09:52 +0000
Subject: Install static libunwind-ptrace library into system (for ltrace, BZ 703159).


---

diff --git a/libunwind-install-ptrace.patch b/libunwind-install-ptrace.patch
new file mode 100644
index 0000000..cca304c
--- /dev/null
+++ b/libunwind-install-ptrace.patch
@@ -0,0 +1,31 @@
+--- libunwind-20110424git1e10c293-orig/src/Makefile.am	2011-05-09 15:46:44.000000000 +0200
++++ libunwind-20110424git1e10c293/src/Makefile.am	2011-05-09 15:53:27.000000000 +0200
+@@ -8,7 +8,7 @@ COMMON_SO_LDFLAGS =	-XCClinker -nostartf
+ lib_LIBRARIES =
+ lib_LTLIBRARIES =
+ if !REMOTE_ONLY
+-lib_LIBRARIES += libunwind-ptrace.a
++lib_LTLIBRARIES += libunwind-ptrace.la
+ lib_LTLIBRARIES += libunwind.la #libunwind-setjmp.la
+ endif
+ 
+@@ -16,7 +16,7 @@ noinst_HEADERS =
+ noinst_LTLIBRARIES =
+ 
+ ### libunwind-ptrace:
+-libunwind_ptrace_a_SOURCES =						  \
++libunwind_ptrace_la_SOURCES =						  \
+ 	ptrace/_UPT_elf.c						  \
+ 	ptrace/_UPT_accessors.c ptrace/_UPT_access_fpreg.c		  \
+ 	ptrace/_UPT_access_mem.c ptrace/_UPT_access_reg.c		  \
+--- libunwind-20110424git1e10c293-orig/tests/Makefile.am	2011-05-09 15:46:44.000000000 +0200
++++ libunwind-20110424git1e10c293/tests/Makefile.am	2011-05-09 15:52:46.000000000 +0200
+@@ -108,7 +108,7 @@ Gtest_trace_SOURCES = Gtest-trace.c iden
+ Ltest_trace_SOURCES = Ltest-trace.c ident.c
+ 
+ LIBUNWIND = $(top_builddir)/src/libunwind-$(arch).la
+-LIBUNWIND_ptrace = $(top_builddir)/src/libunwind-ptrace.a
++LIBUNWIND_ptrace = $(top_builddir)/src/libunwind-ptrace.la
+ 
+ if USE_ELF32
+ LIBUNWIND_ELF = $(top_builddir)/src/libunwind-elf32.la
diff --git a/libunwind.spec b/libunwind.spec
index f488abe..da8d9d9 100644
--- a/libunwind.spec
+++ b/libunwind.spec
@@ -5,12 +5,13 @@ Summary: An unwinding library
 Name: libunwind
 Version: 0.99
 %define snapshot 20110424git1e10c293
-Release: 1.%{snapshot}%{?dist}
+Release: 2.%{snapshot}%{?dist}
 License: BSD
 Group: Development/Debuggers
 Source: libunwind-%{snapshot}.tar.bz2
 #Fedora specific patch
 Patch1: libunwind-disable-setjmp.patch
+Patch2: libunwind-install-ptrace.patch
 URL: http://savannah.nongnu.org/projects/libunwind
 ExclusiveArch: arm hppa ia64 mips ppc ppc64 %{ix86} x86_64
 
@@ -35,6 +36,7 @@ libunwind.
 %prep
 %setup -q -n libunwind-%{snapshot}
 %patch1 -p1
+%patch2 -p1
 
 %build
 aclocal
@@ -42,13 +44,20 @@ libtoolize --force
 autoheader
 automake --add-missing
 autoconf
-%configure --disable-static --enable-shared
+%configure --enable-static --enable-shared
 make %{?_smp_mflags}
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
+
+# /usr/include/libunwind-ptrace.h
+# [...] aren't really part of the libunwind API.  They are implemented in
+# a archive library called libunwind-ptrace.a.
+mv -f $RPM_BUILD_ROOT%{_libdir}/libunwind-ptrace.a $RPM_BUILD_ROOT%{_libdir}/libunwind-ptrace.a-save
+rm -f $RPM_BUILD_ROOT%{_libdir}/libunwind*.a
+mv -f $RPM_BUILD_ROOT%{_libdir}/libunwind-ptrace.a-save $RPM_BUILD_ROOT%{_libdir}/libunwind-ptrace.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/libunwind-ptrace*.so*
 
 %check
 %if 0%{?_with_check:1} || 0%{?_with_testsuite:1}
@@ -71,12 +80,16 @@ echo ====================TESTSUITE DISABLED=========================
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libunwind*.so
+%{_libdir}/libunwind-ptrace.a
 %{_mandir}/*/*
 # <unwind.h> does not get installed for REMOTE_ONLY targets - check it.
 %{_includedir}/unwind.h
 %{_includedir}/libunwind*.h
 
 %changelog
+* Mon May  9 2011 Jan Kratochvil <jan.kratochvil@redhat.com> - 0.99-2.20110424git1e10c293
+- Install static libunwind-ptrace library into system (for ltrace, BZ 703159).
+
 * Sun Apr 24 2011 Jan Kratochvil <jan.kratochvil@redhat.com> - 0.99-1.20110424git1e10c293
 - Rebase to the upstream post-0.99 snapshot (BZ 697453).