From 71e48fa45a3e4d0987c846031ad777d323254e6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Fri, 6 Jun 2014 13:50:54 +0200 Subject: [PATCH] - fix typo when moving headers on non-multiarch arches - don't treat ppc64le (covered by %{power64}) as multiarch --- libffi.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libffi.spec b/libffi.spec index 97cce12..b08ea57 100644 --- a/libffi.spec +++ b/libffi.spec @@ -1,4 +1,4 @@ -%global multilib_arches %{ix86} ppc %{power64} s390 s390x x86_64 +%global multilib_arches %{ix86} ppc ppc64 ppc64p7 s390 s390x x86_64 Name: libffi Version: 3.1 @@ -79,18 +79,18 @@ basearch=%{_arch} basearch=i386 %endif +mkdir -p $RPM_BUILD_ROOT%{_includedir} %ifarch %{multilib_arches} # Do header file switcheroo to avoid file conflicts on systems where you # can have both a 32- and 64-bit version of the library, and they each need # their own correct-but-different versions of the headers to be usable. -mkdir -p $RPM_BUILD_ROOT%{_includedir} for i in ffi ffitarget; do mv $RPM_BUILD_ROOT%{_libdir}/libffi-%{version}/include/$i.h $RPM_BUILD_ROOT%{_includedir}/$i-${basearch}.h done install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_includedir}/ffi.h install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_includedir}/ffitarget.h %else - mv $RPM_BUILD_ROOT%{_libdir}/libffi-%{version}/include/$i.h $RPM_BUILD_ROOT%{_includedir} +mv $RPM_BUILD_ROOT%{_libdir}/libffi-%{version}/include/{ffi,ffitarget}.h $RPM_BUILD_ROOT%{_includedir} %endif rm -rf $RPM_BUILD_ROOT%{_libdir}/libffi-%{version}