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

- Modified the rpm-4.9.0-armhfp-logic.patch after adding the ppc64p7 support

Browse Source
This commit is contained in:
Phil Knirsch 2012-04-19 17:13:03 +02:00
parent b88a8e4d8a
commit 4b44325a0c
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rpm-4.9.0-armhfp-logic.patch
View File

@ -1,7 +1,7 @@
diff -uNr rpm-4.9.0-orig//lib/rpmrc.c rpm-4.9.0/lib/rpmrc.c diff -up rpm-4.9.1.3/lib/rpmrc.c.armhfp-logic rpm-4.9.1.3/lib/rpmrc.c
--- rpm-4.9.0-orig//lib/rpmrc.c 2011-08-05 12:23:04.000000000 -0500 --- rpm-4.9.1.3/lib/rpmrc.c.armhfp-logic 2012-04-19 17:11:32.728750591 +0200
+++ rpm-4.9.0/lib/rpmrc.c 2011-08-05 12:25:13.000000000 -0500 +++ rpm-4.9.1.3/lib/rpmrc.c 2012-04-19 17:11:32.754738455 +0200
@@ -732,6 +732,56 @@ @@ -743,6 +743,56 @@ static int is_sun4v()
} }
#endif #endif
@ -58,9 +58,9 @@ diff -uNr rpm-4.9.0-orig//lib/rpmrc.c rpm-4.9.0/lib/rpmrc.c
# if defined(__linux__) && defined(__i386__) # if defined(__linux__) && defined(__i386__)
#include <setjmp.h> #include <setjmp.h>
@@ -1157,6 +1207,22 @@ @@ -1220,6 +1270,22 @@ static void defaultMachine(const char **
} }
# endif /* sparc*-linux */ # endif /* ppc64*-linux */
+# if defined(__linux__) && defined(__arm__) +# if defined(__linux__) && defined(__arm__)
+ { + {
@ -81,4 +81,3 @@ diff -uNr rpm-4.9.0-orig//lib/rpmrc.c rpm-4.9.0/lib/rpmrc.c
# if defined(__GNUC__) && defined(__alpha__) # if defined(__GNUC__) && defined(__alpha__)
{ {
unsigned long amask, implver; unsigned long amask, implver;