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

...

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=340
This commit is contained in:
Michael Schröder 2014-09-17 12:05:17 +00:00 committed by Git OBS Bridge
parent 2f047d4098
commit 1723a5cbc2
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ignore-auxv.diff
View File

@ -1,10 +1,10 @@
--- ./lib/rpmrc.c.orig 2014-02-05 13:04:02.000000000 +0000 --- ./lib/rpmrc.c.orig 2014-07-03 15:11:48.572096075 +0000
+++ ./lib/rpmrc.c 2014-02-20 12:37:28.209816551 +0000 +++ ./lib/rpmrc.c 2014-09-17 12:04:27.330717791 +0000
@@ -83,10 +83,12 @@ struct rpmOption { @@ -79,10 +79,12 @@ struct rpmOption {
int localize; int localize;
}; };
+#if defined(__linux__) && defined(__powerpc__) +#if defined(__linux__) && (defined(__powerpc__) || defined(__sparc__) || (defined(__arm__) && defined(__ARM_PCS_VFP)))
static struct rpmat_s { static struct rpmat_s {
const char *platform; const char *platform;
uint64_t hwcap; uint64_t hwcap;
@ -13,21 +13,21 @@
typedef struct defaultEntry_s { typedef struct defaultEntry_s {
char * name; char * name;
@@ -914,7 +916,7 @@ static int is_geode(void) @@ -936,7 +938,7 @@ static int is_geode(void)
#endif #endif
-#if defined(__linux__) -#if defined(__linux__)
+#if defined(__linux__) && defined(__powerpc__) +#if defined(__linux__) && (defined(__powerpc__) || defined(__sparc__) || (defined(__arm__) && defined(__ARM_PCS_VFP)))
/** /**
* Populate rpmat structure with auxv values * Populate rpmat structure with auxv values
*/ */
@@ -971,7 +973,7 @@ static void defaultMachine(const char ** @@ -993,7 +995,7 @@ static void defaultMachine(rpmrcCtx ctx,
canonEntry canon; canonEntry canon;
int rc; int rc;
-#if defined(__linux__) -#if defined(__linux__)
+#if defined(__linux__) && defined(__powerpc__) +#if defined(__linux__) && (defined(__powerpc__) || defined(__sparc__) || (defined(__arm__) && defined(__ARM_PCS_VFP)))
/* Populate rpmat struct with hw info */ /* Populate rpmat struct with hw info */
read_auxv(); read_auxv();
#endif #endif