From e780ef58606d97defda0790a4265fa6f5717e91e Mon Sep 17 00:00:00 2001 From: Phil Knirsch Date: Apr 23 2012 08:55:30 +0000 Subject: - Modified the rpm-4.9.0-armhfp-logic.patch after adding the ppc64p7 support (cherry picked from commit 4b44325a0cf8dbfdb3761dcb11c2fe70b71be1ff) --- diff --git a/rpm-4.9.0-armhfp-logic.patch b/rpm-4.9.0-armhfp-logic.patch index 9cefb2f..be00bba 100644 --- a/rpm-4.9.0-armhfp-logic.patch +++ b/rpm-4.9.0-armhfp-logic.patch @@ -1,7 +1,7 @@ -diff -uNr rpm-4.9.0-orig//lib/rpmrc.c rpm-4.9.0/lib/rpmrc.c ---- rpm-4.9.0-orig//lib/rpmrc.c 2011-08-05 12:23:04.000000000 -0500 -+++ rpm-4.9.0/lib/rpmrc.c 2011-08-05 12:25:13.000000000 -0500 -@@ -732,6 +732,56 @@ +diff -up rpm-4.9.1.3/lib/rpmrc.c.armhfp-logic rpm-4.9.1.3/lib/rpmrc.c +--- rpm-4.9.1.3/lib/rpmrc.c.armhfp-logic 2012-04-19 17:11:32.728750591 +0200 ++++ rpm-4.9.1.3/lib/rpmrc.c 2012-04-19 17:11:32.754738455 +0200 +@@ -743,6 +743,56 @@ static int is_sun4v() } #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__) #include -@@ -1157,6 +1207,22 @@ - } - # endif /* sparc*-linux */ +@@ -1220,6 +1270,22 @@ static void defaultMachine(const char ** + } + # endif /* ppc64*-linux */ +# 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__) { unsigned long amask, implver; -