revert previous change, fix it properly
This commit is contained in:
parent
06f8fdc33f
commit
283b84342e
|
@ -0,0 +1,22 @@
|
|||
diff -up libunwind-1.3.1/include/libunwind.h.in.multilibfix libunwind-1.3.1/include/libunwind.h.in
|
||||
--- libunwind-1.3.1/include/libunwind.h.in.multilibfix 2020-08-13 10:06:03.275601460 -0400
|
||||
+++ libunwind-1.3.1/include/libunwind.h.in 2020-08-13 10:06:29.579522623 -0400
|
||||
@@ -1,8 +1,6 @@
|
||||
/* Provide a real file - not a symlink - as it would cause multiarch conflicts
|
||||
when multiple different arch releases are installed simultaneously. */
|
||||
|
||||
-#ifndef UNW_REMOTE_ONLY
|
||||
-
|
||||
#if defined __aarch64__
|
||||
#include "libunwind-aarch64.h"
|
||||
#elif defined __arm__
|
||||
@@ -28,9 +26,3 @@
|
||||
#else
|
||||
# error "Unsupported arch"
|
||||
#endif
|
||||
-
|
||||
-#else /* UNW_REMOTE_ONLY */
|
||||
-
|
||||
-# include "libunwind-@arch@.h"
|
||||
-
|
||||
-#endif /* UNW_REMOTE_ONLY */
|
|
@ -4,7 +4,7 @@
|
|||
Summary: An unwinding library
|
||||
Name: libunwind
|
||||
Version: 1.3.1
|
||||
Release: 6%{?dist}
|
||||
Release: 7%{?dist}
|
||||
License: BSD
|
||||
URL: http://savannah.nongnu.org/projects/libunwind
|
||||
Source: http://download-mirror.savannah.gnu.org/releases/libunwind/libunwind-%{version}.tar.gz
|
||||
|
@ -15,11 +15,12 @@ Patch1: libunwind-arm-default-to-exidx.patch
|
|||
# https://github.com/libunwind/libunwind/commit/05d814b64036b1ea2f0f328b3a985b03559dcf10
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1795896
|
||||
Patch2: libunwind-1.3.1-no-core-mem-check.patch
|
||||
# Make libunwind.h multilib friendly
|
||||
Patch3: libunwind-1.3.1-multilib-fix.patch
|
||||
|
||||
ExclusiveArch: %{arm} aarch64 hppa ia64 mips ppc %{power64} %{ix86} x86_64
|
||||
|
||||
BuildRequires: automake libtool autoconf texlive-latex2man
|
||||
BuildRequires: multilib-rpm-config
|
||||
|
||||
# host != target would cause REMOTE_ONLY build even if building i386 on x86_64.
|
||||
%global _host %{_target_platform}
|
||||
|
@ -39,6 +40,7 @@ libunwind.
|
|||
%setup -q
|
||||
%patch1 -p1 -b .default-to-exidx
|
||||
%patch2 -p1 -b .no-core-mem-check
|
||||
%patch3 -p1 -b .multilib-fix
|
||||
|
||||
%build
|
||||
%global optflags %{optflags} -fcommon
|
||||
|
@ -54,8 +56,6 @@ make %{?_smp_mflags}
|
|||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
|
||||
|
||||
%multilib_fix_c_header --file %{_includedir}/libunwind.h
|
||||
|
||||
# /usr/include/libunwind-ptrace.h
|
||||
# [...] aren't really part of the libunwind API. They are implemented in
|
||||
# a archive library called libunwind-ptrace.a.
|
||||
|
@ -93,6 +93,10 @@ echo ====================TESTSUITE DISABLED=========================
|
|||
%{_includedir}/libunwind*.h
|
||||
|
||||
%changelog
|
||||
* Thu Aug 13 2020 Tom Callaway <spot@fedoraproject.org> - 1.3.1-7
|
||||
- revert previous change
|
||||
- fix it properly
|
||||
|
||||
* Mon Aug 10 2020 Tom Callaway <spot@fedoraproject.org> - 1.3.1-6
|
||||
- fix multilib issues with libunwind.h (bz1866512)
|
||||
|
||||
|
|
Loading…
Reference in New Issue