- rel 2; rebuild with fPIC

Changed files:
    libunwind-rpath.patch -> 1.1
    libunwind.spec -> 1.15

diff --git a/libunwind-rpath.patch b/libunwind-rpath.patch
new file mode 100644 (file)
index 0000000..4363120
--- /dev/null
+++ b/libunwind-rpath.patch
@@ -0,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 090828-rpath.dpatch by Daigo Moriwaki <daigo@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: rpath should not be used
+## DP: http://wiki.debian.org/RpathIssue
+
+@DPATCH@
+diff -urNad libunwind-0.99~/configure.in libunwind-0.99/configure.in
+--- libunwind-0.99~/configure.in       2009-05-09 01:34:10.000000000 +0900
++++ libunwind-0.99/configure.in        2009-08-29 10:41:18.000000000 +0900
+@@ -17,10 +17,20 @@
+ AC_PROG_CXX
+ AC_PROG_INSTALL
+ AC_PROG_MAKE_SET
+-AM_PROG_LIBTOOL
++AC_PROG_LIBTOOL
+ AM_PROG_AS
+ AM_PROG_CC_C_O
+ 
++case ${host} in
++  *-pc-linux-gnu)
++    AC_MSG_RESULT([Fixing libtool for -rpath problems.])
++    sed < libtool > libtool-2 \
++    's/^hardcode_libdir_flag_spec.*$'/'hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/'
++    mv libtool-2 libtool
++    chmod 755 libtool
++  ;;
++esac
++
+ dnl Checks for libraries.
+ AC_CHECK_LIB(uca, __uc_get_grs)
+ CHECK_ATOMIC_OPS

diff --git a/libunwind.spec b/libunwind.spec
index 2c49cc285d87bd04f4b6acfa18b7c8b93b955b32..cc9ced14d84092757309db74a6fbc3b3bd7d3c35 100644 (file)
--- a/libunwind.spec
+++ b/libunwind.spec
@@ -1,3 +1,4 @@
+%bcond_with    tests
 Summary:       libunwind - a (mostly) platform-independent unwind API
 Summary(pl.UTF-8):     libunwind - (prawie) niezależne od platformy API do rozwijania
 Name:          libunwind
@@ -8,6 +9,7 @@ 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
 URL:           http://www.nongnu.org/libunwind/
 BuildRequires:  autoconf
 BuildRequires:  automake >= 1.6
@@ -66,6 +68,7 @@ Statyczna biblioteka libunwind.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -73,9 +76,12 @@ Statyczna biblioteka libunwind.
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure \
+       CPPFLAGS="%{rpmcppflags} -fPIC"
 %{__make}
 
+%{?with_tests:%{__make} check}
+
 %install
 rm -rf $RPM_BUILD_ROOT