tizen 2.3 release tizen_2.3 submit/tizen_2.3/20150202.055829 tizen_2.3_release
authorjk7744.park <jk7744.park@samsung.com>
Sun, 1 Feb 2015 04:21:44 +0000 (13:21 +0900)
committerjk7744.park <jk7744.park@samsung.com>
Sun, 1 Feb 2015 04:21:44 +0000 (13:21 +0900)
packaging/libunwind.spec
packaging/revert_unwind_table_search.patch [deleted file]

index c147fd9..378cccb 100644 (file)
@@ -19,7 +19,7 @@
 Name:           libunwind
 BuildRequires:  gcc-c++
 BuildRequires:  libtool
-BuildRequires:  pkgconfig
+BuildRequires:  pkg-config
 Url:            http://savannah.nongnu.org/projects/libunwind/
 Summary:        Unwind Library
 License:        MIT
@@ -38,7 +38,7 @@ Patch3:               fix_symlink.patch
 Patch4:                fix_builderror.patch
 Patch5:                fix_unwindinfo_free.patch
 Patch6:                disable_UNW_ARM_METHOD_FRAME.patch
-Patch7:                revert_unwind_table_search.patch
+
 
 %description
 A portable and efficient C programming interface (API) to determine the
@@ -76,7 +76,6 @@ cp %SOURCE1 .
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
 
 %build
 autoreconf -fi
@@ -97,8 +96,6 @@ mv $RPM_BUILD_ROOT%{_libdir}/libunwind.so.8* $RPM_BUILD_ROOT/%{_lib}
 ln -sf /%{_lib}/libunwind.so.8 $RPM_BUILD_ROOT%{_libdir}/libunwind.so
 # Check that ln did not create a dangling link
 stat "%buildroot"/$(readlink -f "%buildroot/%_libdir/libunwind.so");
-mkdir -p %{buildroot}/usr/share/license
-cp LICENSE %{buildroot}/usr/share/license/%{name}
 
 %post -p /sbin/ldconfig
 
@@ -107,7 +104,6 @@ cp LICENSE %{buildroot}/usr/share/license/%{name}
 %files
 %defattr(-, root, root)
 %manifest %{name}.manifest
-/usr/share/license/%{name}
 /%_lib/lib*
 %{_libdir}/lib*.so.*
 %{_libdir}/libunwind.so
diff --git a/packaging/revert_unwind_table_search.patch b/packaging/revert_unwind_table_search.patch
deleted file mode 100644 (file)
index fbd4a04..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/arm/Gex_tables.c b/src/arm/Gex_tables.c
-index 8004fb5..4756ad3 100644
---- a/src/arm/Gex_tables.c
-+++ b/src/arm/Gex_tables.c
-@@ -397,7 +397,7 @@ tdep_search_unwind_table (unw_addr_space_t as, unw_word_t ip,
-       unw_word_t last = di->u.rti.table_data + di->u.rti.table_len - 8;
-       unw_word_t entry, val;
--      if (prel31_to_addr (as, arg, first, &val) < 0 || ip < val)
-+      if (prel31_to_addr (as, arg, first, &val) < 0 && ip < val)
-       return -UNW_ENOINFO;
-       if (prel31_to_addr (as, arg, last, &val) < 0)