On Thu, 2013-01-03 at 14:02 -0700, Al Stone wrote:
> The redhat-rpm-config and rpm packages build, but Mark Salter and
> Jon Masters will need to put their heads together to figure out
> what needs changing so that they'll work properly for aarch64.

I'm trying the following for rpm (along with updated config.guess/sub).
It builds but install step hangs in installplatform when it calls the
build dir rpm. I'm trying to sort that out now.

diff --git a/stage2/recipe.d/0036-rpm b/stage2/recipe.d/0036-rpm
index 80f670e..af986b9 100644
--- a/stage2/recipe.d/0036-rpm
+++ b/stage2/recipe.d/0036-rpm
@@ -16,11 +16,11 @@
 
        mcd $BUILDDIR/rpm
        $SRC/rpm-*/configure $TCONFIGARGS \
-               --build=armv7hl-redhat-linux-gnueabi \
-               --host=armv7hl-redhat-linux-gnueabi \
-               --target=armv7hl-redhat-linux-gnueabi \
+               --build=aarch64-redhat-linux-gnu \
+               --host=aarch64-redhat-linux-gnu \
+               --target=aarch64-redhat-linux-gnu \
                CPPFLAGS="-I/usr/include/nspr -I/usr/include/nss3" \
-               --libdir=/usr/lib \
+               --libdir=/usr/lib${SUFFIX} \
                --with-external-db \
                --disable-static \
                --without-lua \
diff --git a/stage2/rpmbuild/BUILD/rpm-4.9.1.3/configure.ac 
b/stage2/rpmbuild/BUILD/rpm-4.9.1.3/configure.ac
index 29eb17e..02b842e 100644
--- a/stage2/rpmbuild/BUILD/rpm-4.9.1.3/configure.ac
+++ b/stage2/rpmbuild/BUILD/rpm-4.9.1.3/configure.ac
@@ -819,6 +819,7 @@ mips*)              RPMCANONCOLOR=0; RPMCANONARCH=mips ;;
 m68k*)         RPMCANONCOLOR=0; RPMCANONARCH=m68k ;;
 sh3*)          RPMCANONCOLOR=0; RPMCANONARCH=sh3 ;;
 sh4*)          RPMCANONCOLOR=0; RPMCANONARCH=sh4 ;;
+aarch64*)      RPMCANONCOLOR=2; RPMCANONARCH=aarch64 ;;
 *)             RPMCANONCOLOR=0; RPMCANONARCH=unknown ;;
 esac
 case "${host_os_noversion}" in
diff --git a/stage2/rpmbuild/BUILD/rpm-4.9.1.3/installplatform 
b/stage2/rpmbuild/BUILD/rpm-4.9.1.3/installplatform
index d57eef0..4cccda1 100755
--- a/stage2/rpmbuild/BUILD/rpm-4.9.1.3/installplatform
+++ b/stage2/rpmbuild/BUILD/rpm-4.9.1.3/installplatform
@@ -50,6 +50,7 @@ for SUBST in $SUBSTS ; do
     s390x-linux) LIB=lib64 ;;
     ppc64-linux|ppc64p7-linux|powerpc64-linux) LIB=lib64 ;;
     x86_64-linux|amd64-linux|ia32e-linux) LIB=lib64 ;;
+    aarch64-linux) LIB=lib64 ;;
     *) LIB=lib;;
   esac
 
@@ -106,6 +107,10 @@ for SUBST in $SUBSTS ; do
        ISANAME=alpha
        ISABITS=64
        ;;
+    aarch64*)
+       ISANAME=aarch64
+       ISABITS=64
+       ;;
   esac
 
   case $VENDOR in
diff --git a/stage2/rpmbuild/BUILD/rpm-4.9.1.3/macros.in 
b/stage2/rpmbuild/BUILD/rpm-4.9.1.3/macros.in
index 7f0b2f9..75dad53 100644
--- a/stage2/rpmbuild/BUILD/rpm-4.9.1.3/macros.in
+++ b/stage2/rpmbuild/BUILD/rpm-4.9.1.3/macros.in
@@ -1038,6 +1038,10 @@ done \
 %arm   armv3l armv4b armv4l armv4tl armv5tel armv5tejl armv6l armv7l armv7hl 
armv7hnl
 
 #------------------------------------------------------------------------------
+# arch macro for aarch64
+%aarch64       aarch64
+
+#------------------------------------------------------------------------------
 # arch macro for all supported PowerPC 64 processors
 %power64       ppc64 ppc64p7
 
diff --git a/stage2/rpmbuild/BUILD/rpm-4.9.1.3/rpmrc.in 
b/stage2/rpmbuild/BUILD/rpm-4.9.1.3/rpmrc.in
index 5b27d74..8a1b9b4 100644
--- a/stage2/rpmbuild/BUILD/rpm-4.9.1.3/rpmrc.in
+++ b/stage2/rpmbuild/BUILD/rpm-4.9.1.3/rpmrc.in
@@ -85,6 +85,8 @@ optflags: sh3 -O2 -g
 optflags: sh4 -O2 -g -mieee
 optflags: sh4a -O2 -g -mieee
 
+optflags: aarch64 -O2 -g
+
 #############################################################
 # Canonical arch names and numbers
 
@@ -169,6 +171,8 @@ arch_canon: sh3: sh3        17
 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
@@ -279,6 +283,8 @@ buildarchtranslate: sh3: sh3
 buildarchtranslate: sh4: sh4
 buildarchtranslate: sh4a: sh4
 
+buildarchtranslate: aarch64: aarch64
+
 #############################################################
 # Architecture compatibility
 
@@ -371,6 +377,8 @@ arch_compat: sh3: noarch
 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
@@ -484,5 +492,7 @@ buildarch_compat: sh3: noarch
 buildarch_compat: sh4: noarch
 buildarch_compat: sh4a: sh4
 
+buildarch_compat: aarch64: noarch
+
 # \endverbatim
 #*/


_______________________________________________
arm mailing list
[email protected]
https://admin.fedoraproject.org/mailman/listinfo/arm

Reply via email to