From 576a302dc857615f37e3cecc1140970414590c75 Mon Sep 17 00:00:00 2001 From: Michael Schroeder Date: Fri, 2 May 2014 10:43:11 +0200 Subject: [PATCH 1/1] add #ifdef FEDORA lines --- src/poolarch.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/poolarch.c b/src/poolarch.c index f2d8e68..79d3bd3 100644 --- a/src/poolarch.c +++ b/src/poolarch.c @@ -21,24 +21,22 @@ #include "util.h" static const char *archpolicies[] = { - "ia32e", "ia32e:x86_64:athlon:i686:i586:i486:i386", - "amd64", "amd64:x86_64:athlon:i686:i586:i486:i386", +#ifdef FEDORA "x86_64", "x86_64:athlon:i686:i586:i486:i386", - "athlon", "athlon:i686:i586:i486:i386", +#else + "x86_64", "x86_64:i686:i586:i486:i386", +#endif "i686", "i686:i586:i486:i386", - "geode", "geode:i586:i486:i386", "i586", "i586:i486:i386", "i486", "i486:i386", "i386", "i386", "s390x", "s390x:s390", "s390", "s390", - "ia64", "ia64:i686:i586:i486:i386", - "ppc64iseries", "ppc64iseries:ppc64:ppc", - "ppc64pseries", "ppc64pseries:ppc64:ppc", + "ppc64le", "ppc64le", "ppc64", "ppc64:ppc", "ppc", "ppc", "ppc64p7", "ppc64p7:ppc64:ppc", - "ppc64le", "ppc64le", + "ia64", "ia64:i686:i586:i486:i386", "aarch64", "aarch64", "armv6hl", "armv6hl", "armv7hnl", "armv7hnl:armv7hl:armv6hl", @@ -63,6 +61,14 @@ static const char *archpolicies[] = { "sparc", "sparc", "mipsel", "mipsel", "m68k", "m68k", +#ifdef FEDORA + "ia32e", "ia32e:x86_64:athlon:i686:i586:i486:i386", + "athlon", "athlon:i686:i586:i486:i386", + "amd64", "amd64:x86_64:athlon:i686:i586:i486:i386", + "geode", "geode:i586:i486:i386", + "ppc64iseries", "ppc64iseries:ppc64:ppc", + "ppc64pseries", "ppc64pseries:ppc64:ppc", +#endif 0 }; -- 2.7.4