rpms/rpm
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Hopefully fix armv7 vfp/neon detection

Browse Source
This commit is contained in:
Panu Matilainen 2014-07-02 14:32:57 +03:00
parent 421823c7c2
commit 017fe597e0
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rpm-4.11.90-arm-vfp3.patch Normal file
View File

@ -0,0 +1,18 @@
diff -up rpm-4.11.90-git12844/lib/rpmrc.c.arm-vfp3 rpm-4.11.90-git12844/lib/rpmrc.c
--- rpm-4.11.90-git12844/lib/rpmrc.c.arm-vfp3 2014-07-02 13:06:07.626643228 +0300
+++ rpm-4.11.90-git12844/lib/rpmrc.c 2014-07-02 13:06:24.290591042 +0300
@@ -1156,11 +1156,11 @@ static void defaultMachine(rpmrcCtx ctx,
# if !defined(HWCAP_ARM_NEON)
# define HWCAP_ARM_NEON (1 << 12)
# endif
-# if !defined(HWCAP_ARM_VFPv3D16)
-# define HWCAP_ARM_VFPv3D16 (1 << 13)
+# if !defined(HWCAP_ARM_VFPv3)
+# define HWCAP_ARM_VFPv3 (1 << 13)
# endif
if (rstreq(un.machine, "armv7l")) {
- if (rpmat.hwcap & HWCAP_ARM_VFPv3D16) {
+ if (rpmat.hwcap & HWCAP_ARM_VFPv3) {
if (rpmat.hwcap & HWCAP_ARM_NEON)
strcpy(un.machine, "armv7hnl");
else

2
rpm.spec
View File

@ -50,6 +50,7 @@ Patch4: rpm-4.8.1-use-gpg2.patch
# Patches already upstream:
Patch100: rpm-4.11.90-hardlink-groups.patch
Patch101: rpm-4.11.90-expand-load-arg.patch
Patch102: rpm-4.11.90-arm-vfp3.patch
# These are not yet upstream
Patch302: rpm-4.7.1-geode-i686.patch
@ -530,6 +531,7 @@ exit 0
%changelog
* Wed Jul 02 2014 Panu Matilainen <pmatilai@redhat.com> - 4.11.90-0.git12844.4
- Use autosetup for building rpm itself
- Hopefully fix armv7 vfp/neon detection
* Tue Jul 01 2014 Panu Matilainen <pmatilai@redhat.com> - 4.11.90-0.git12844.3
- Drop no longer needed temporary UsrMove patch