pool/rpm
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- extend the armv7hl hack also to armv6hl

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=273
This commit is contained in:
Dirk Mueller 2013-07-02 09:53:17 +00:00 committed by Git OBS Bridge
parent c1c49f6888
commit 8d667a3d2a
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rpm.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Jul 2 09:53:02 UTC 2013 - dmueller@suse.com
- extend the armv7hl hack also to armv6hl
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 27 22:03:51 UTC 2013 - dmueller@suse.com Thu Jun 27 22:03:51 UTC 2013 - dmueller@suse.com

13
rpm.spec
View File

@ -251,13 +251,11 @@ export LDFLAGS="-Wl,-Bsymbolic-functions -ffunction-sections"
export CFLAGS="-g -O0 -fno-strict-aliasing -ffunction-sections" export CFLAGS="-g -O0 -fno-strict-aliasing -ffunction-sections"
%endif %endif
%if %{_target_cpu}
%ifarch %arm %ifarch %arm
BUILDTARGET="--build=%{_target_cpu}-suse-linux-gnueabi" BUILDTARGET="--build=%{_target_cpu}-suse-linux-gnueabi"
%else %else
BUILDTARGET="--build=%{_target_cpu}-suse-linux" BUILDTARGET="--build=%{_target_cpu}-suse-linux"
%endif %endif
%endif
#cp -p /usr/share/gettext/config.rpath . #cp -p /usr/share/gettext/config.rpath .
cp autogen.sh beecrypt cp autogen.sh beecrypt
@ -355,15 +353,10 @@ rm -f %{buildroot}%{_libdir}/*.la
rm -f %{buildroot}%{_libdir}/rpm-plugins/*.la rm -f %{buildroot}%{_libdir}/rpm-plugins/*.la
sh %{buildroot}/usr/lib/rpm/find-lang.sh %{buildroot} rpm sh %{buildroot}/usr/lib/rpm/find-lang.sh %{buildroot} rpm
# On arm the kernel architecture is ignored. Not the best idea, but lets stay compatible with other distros # On arm the kernel architecture is ignored. Not the best idea, but lets stay compatible with other distros
%ifarch armv7hl %ifarch armv7hl armv6hl
# rpm is using the host_cpu as default for the platform, but armv7hl is not known by the kernel. # rpm is using the host_cpu as default for the platform, but armv6/7hl is not known by the kernel.
# so we need to enforce the platform here. # so we need to enforce the platform here.
# We don't want to use armv7l because it would make us incompatible to Fedora and MeeGo plattforms. echo -n "%{_target_cpu}-suse-linux-gnueabi" > %{buildroot}/etc/rpm/platform
echo -n armv7hl-suse-linux> %{buildroot}/etc/rpm/platform
%endif
%ifarch armv5tel
# switch to armv5tel even when system cpu is armv7
echo -n armv5tel-suse-linux> %{buildroot}/etc/rpm/platform
%endif %endif
%post %post