rpms/libffi
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- fix typo when moving headers on non-multiarch arches

Browse Source 
- don't treat ppc64le (covered by %{power64}) as multiarch
This commit is contained in:
Dan Horák 2014-06-06 13:50:54 +02:00
parent b3340e8c75
commit 71e48fa45a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libffi.spec
View File

@ -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 Name: libffi
Version: 3.1 Version: 3.1
@ -79,18 +79,18 @@ basearch=%{_arch}
basearch=i386 basearch=i386
%endif %endif
mkdir -p $RPM_BUILD_ROOT%{_includedir}
%ifarch %{multilib_arches} %ifarch %{multilib_arches}
# Do header file switcheroo to avoid file conflicts on systems where you # 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 # 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. # their own correct-but-different versions of the headers to be usable.
mkdir -p $RPM_BUILD_ROOT%{_includedir}
for i in ffi ffitarget; do for i in ffi ffitarget; do
mv $RPM_BUILD_ROOT%{_libdir}/libffi-%{version}/include/$i.h $RPM_BUILD_ROOT%{_includedir}/$i-${basearch}.h mv $RPM_BUILD_ROOT%{_libdir}/libffi-%{version}/include/$i.h $RPM_BUILD_ROOT%{_includedir}/$i-${basearch}.h
done done
install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_includedir}/ffi.h install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_includedir}/ffi.h
install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_includedir}/ffitarget.h install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_includedir}/ffitarget.h
%else %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 %endif
rm -rf $RPM_BUILD_ROOT%{_libdir}/libffi-%{version} rm -rf $RPM_BUILD_ROOT%{_libdir}/libffi-%{version}