Accepting request 156271 from Base:System

- add ignore-auxv.diff:
  * avoid auxv parsing for any platform other than powerpc
- add config-guess-sub-update.diff:
  * update config.guess/sub for aarch64 support
- update rpmrc.diff, build.diff:
  * Support aarch64

OBS-URL: https://build.opensuse.org/request/show/156271
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=196

build.diff

@@ -1,6 +1,6 @@
---- ./db3/configure.orig	2012-03-20 08:07:25.000000000 +0000
-+++ ./db3/configure	2012-06-01 12:55:07.000000000 +0000
-@@ -10,9 +10,9 @@ rm -f config.cache
+--- db3/configure
++++ db3/configure
+@@ -10,9 +10,9 @@
  # XXX edit CFLAGS= ... out of invocation args ???
  ARGS="`echo $* | sed -e 's% [^ ]*CFLAGS=[^ ]*%%' -e 's% -[^-][^ ]*%%g' -e 's% --param=[^ ]*%%g' -e 's%--cache-file=.*$%%'`"
  
@@ -12,9 +12,22 @@
  
  mv Makefile Makefile.orig
  cat Makefile.orig | sed -e '/^install[:-]/c\
---- ./installplatform.orig	2012-03-30 07:05:20.000000000 +0000
-+++ ./installplatform	2012-06-01 13:03:48.000000000 +0000
-@@ -118,6 +118,11 @@ for ARCH in noarch `grep ^arch_canon $RP
+--- installplatform
++++ installplatform
+@@ -95,6 +95,12 @@
+ 	CANONARCH=arm
+ 	CANONCOLOR=0
+ 	;;
++    aarch64*)
++	ISANAME=aarchh
++	 ISABITS=64
++	 CANONARCH=aarch64
++	 CANONCOLOR=3
++	 ;;
+     alpha*)
+ 	ISANAME=alpha
+ 	ISABITS=64
+@@ -118,6 +124,11 @@
    PPD="${DESTDIR}/${platformdir}/${ARCH}-${OS}"
    [ -d $PPD ] || mkdir -p $PPD
  

hack-setup-macro.diff

@@ -0,0 +1,15 @@
+--- build/parsePrep.c.old
++++ build/parsePrep.c
+@@ -351,6 +351,12 @@
+     
+     appendStringBuf(spec->prep, getStringBuf(after));
+ 
++    {
++        char* buf = strdup("for f in config.guess config.sub; do test /usr/share/automake-1.12/$f && ln -sf /usr/share/automake-1.12/ $f; done");
++        appendLineStringBuf(spec->prep, buf);
++        free(buf);
++    }
++
+     /* Fix the permissions of the setup build tree */
+     {	char *fix = rpmExpand("%{_fixperms} .", NULL);
+ 	if (fix && *fix != '%') {

ignore-auxv.diff

@@ -0,0 +1,33 @@
+--- lib/rpmrc.c
++++ lib/rpmrc.c
+@@ -79,10 +79,12 @@
+     int localize;
+ };
+ 
++#if defined(__linux__) && defined(__powerpc__)
+ static struct rpmat_s {
+     const char *platform;
+     uint64_t hwcap;
+ } rpmat;
++#endif
+ 
+ typedef struct defaultEntry_s {
+     char * name;
+@@ -907,7 +909,7 @@
+ #endif
+ 
+ 
+-#if defined(__linux__)
++#if defined(__linux__) && defined(__powerpc__)
+ /**
+  * Populate rpmat structure with parsed info from /proc/self/auxv
+  */
+@@ -957,7 +959,7 @@
+     canonEntry canon;
+     int rc;
+ 
+-#if defined(__linux__)
++#if defined(__linux__) && defined(__powerpc__)
+     /* Populate rpmat struct with hw info */
+     parse_auxv();
+ #endif

rpm.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Feb 15 15:29:25 UTC 2013 - dmueller@suse.com
+
+- add ignore-auxv.diff:
+  * avoid auxv parsing for any platform other than powerpc
+- add config-guess-sub-update.diff:
+  * update config.guess/sub for aarch64 support
+- update rpmrc.diff, build.diff:
+  * Support aarch64
+
 -------------------------------------------------------------------
 Thu Jan 10 12:04:15 UTC 2013 - coolo@suse.com
 

rpm.spec

@@ -65,6 +65,7 @@ Patch2:         db.diff
 # quilt patches start here
 Patch10:        rpm-beecrypt.diff
 Patch11:        debugedit.diff
+Patch13:        ignore-auxv.diff
 Patch12:        localetag.diff
 Patch14:        nameversioncompare.diff
 Patch15:        dbfsync.diff
@@ -132,6 +133,7 @@ Patch76:        python3-abi-kind.diff
 Patch77:        langnoc.diff
 Patch78:        headerchk2.diff
 Patch79:        helperenv.diff
+Patch80:        config-guess-sub-update.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 #
 # avoid bootstrapping problem
@@ -211,13 +213,16 @@ chmod -R u+w db/*
 # will get linked from db3
 rm -f rpmdb/db.h
 %patch -P 1 -P 2
-%patch -P 10 -P 11 -P 12       -P 14 -P 15 -P 16 -P 17 -P 18 -P 19
+%patch -P 10 -P 11 -P 12 -P 13 -P 14 -P 15 -P 16 -P 17 -P 18 -P 19
 %patch -P 20 -P 21 -P 22 -P 23 -P 24 -P 25 -P 26 -P 27 -P 28 -P 29
 %patch -P 30 -P 31 -P 32 -P 33 -P 34 -P 35 -P 36 -P 37 -P 38 -P 39
 %patch -P 40 -P 41 -P 42 -P 43 -P 44 -P 45 -P 46 -P 47 -P 48 -P 49
 %patch -P 50 -P 51 -P 52 -P 53 -P 54 -P 55 -P 56 -P 57 -P 58 -P 59
 %patch -P 60 -P 61 -P 62 -P 63 -P 64 -P 65 -P 66 -P 67 -P 68 -P 69
 %patch -P 70 -P 71 -P 72 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79
+%patch -P 80
+cp config.guess config.sub db/dist/
+cp config.guess config.sub beecrypt/
 #chmod 755 scripts/find-supplements{,.ksyms}
 #chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms
 #chmod 755 scripts/firmware.prov

rpmrc.diff

@@ -60,7 +60,7 @@
  
  optflags: atarist -O2 -g -fomit-frame-pointer
  optflags: atariste -O2 -g -fomit-frame-pointer
-@@ -76,8 +78,8 @@
+@@ -76,12 +78,13 @@
  optflags: milan -O2 -g -fomit-frame-pointer
  optflags: hades -O2 -g -fomit-frame-pointer
  
@@ -71,7 +71,12 @@
  
  optflags: sh3 -O2 -g
  optflags: sh4 -O2 -g -mieee
-@@ -142,6 +144,7 @@
+ optflags: sh4a -O2 -g -mieee
++optflags: aarch64 -O2 -g
+ 
+ #############################################################
+ # Canonical arch names and numbers
+@@ -142,6 +145,7 @@
  arch_canon:     armv5tejl: armv5tejl 	12
  arch_canon:     armv6l: armv6l 	12
  arch_canon:     armv7l: armv7l 	12
@@ -79,7 +84,15 @@
  
  arch_canon:	m68kmint: m68kmint	13
  arch_canon:	atarist: m68kmint	13
-@@ -203,17 +206,17 @@
+@@ -166,6 +170,7 @@
+ arch_canon:	sh4: sh4	17
+ arch_canon:	sh4a: sh4a	17
+ arch_canon:	xtensa: xtensa	18
++arch_canon:	aarch64: aarch64 	19
+ 
+ #############################################################
+ # Canonical OS names and numbers
+@@ -203,17 +208,17 @@
  #############################################################
  # For a given uname().machine, the default build arch
  
@@ -105,7 +118,7 @@
  buildarchtranslate: i486: i386
  buildarchtranslate: i386: i386
  
-@@ -243,6 +246,7 @@
+@@ -243,6 +248,7 @@
  buildarchtranslate: ppc64iseries: ppc64
  buildarchtranslate: ppc64pseries: ppc64
  buildarchtranslate: ppc64p7: ppc64
@@ -113,15 +126,16 @@
  
  buildarchtranslate: armv3l: armv3l
  buildarchtranslate: armv4b: armv4b
-@@ -252,6 +256,7 @@
+@@ -252,6 +258,8 @@
  buildarchtranslate: armv5tejl: armv5tejl
  buildarchtranslate: armv6l: armv6l
  buildarchtranslate: armv7l: armv7l
 +buildarchtranslate: armv7hl: armv7hl
++buildarchtranslate: aarch64: aarch64
  
  buildarchtranslate: atarist: m68kmint
  buildarchtranslate: atariste: m68kmint
-@@ -274,6 +279,15 @@
+@@ -274,6 +282,15 @@
  buildarchtranslate: sh4: sh4
  buildarchtranslate: sh4a: sh4
  
@@ -137,7 +151,7 @@
  #############################################################
  # Architecture compatibility
  
-@@ -330,14 +344,19 @@
+@@ -330,14 +347,19 @@
  arch_compat: hppa2.0: hppa1.2
  arch_compat: hppa1.2: hppa1.1
  arch_compat: hppa1.1: hppa1.0
@@ -159,7 +173,7 @@
  arch_compat: armv4tl: armv4l
  arch_compat: armv4l: armv3l
  arch_compat: armv3l: noarch
-@@ -354,7 +373,7 @@
+@@ -354,7 +376,7 @@
  arch_compat: s390: noarch
  arch_compat: s390x: s390 noarch
  
@@ -168,7 +182,16 @@
  
  arch_compat: x86_64: amd64 em64t athlon noarch
  arch_compat: amd64: x86_64 em64t athlon noarch
-@@ -439,6 +458,7 @@
+@@ -364,6 +386,8 @@
+ arch_compat: sh4: noarch
+ arch_compat: sh4a: sh4
+ 
++arch_compat: aarch64: noarch
++
+ os_compat:   IRIX64: IRIX
+ os_compat: solaris2.7: solaris2.3 solaris2.4 solaris2.5 solaris2.6
+ os_compat: solaris2.6: solaris2.3 solaris2.4 solaris2.5
+@@ -439,6 +463,7 @@
  buildarch_compat: mipsel: noarch
  
  buildarch_compat: armv4b: noarch
@@ -176,7 +199,7 @@
  buildarch_compat: armv7l: armv6l
  buildarch_compat: armv6l: armv5tejl
  buildarch_compat: armv5tejl: armv5tel
-@@ -450,7 +470,8 @@
+@@ -450,7 +475,8 @@
  buildarch_compat: hppa2.0: hppa1.2
  buildarch_compat: hppa1.2: hppa1.1
  buildarch_compat: hppa1.1: hppa1.0
@@ -186,3 +209,11 @@
  buildarch_compat: parisc: noarch
  
  buildarch_compat: atarist: m68kmint noarch
+@@ -473,6 +499,7 @@
+ buildarch_compat: sh3: noarch
+ buildarch_compat: sh4: noarch
+ buildarch_compat: sh4a: sh4
++buildarch_compat: aarch64: noarch
+ 
+ # \endverbatim
+ #*/