Changeset 58271f6 in rtems

Timestamp:

05/21/00 15:23:02 (23 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Children:

1b69693

Parents:

f9c0574

Message:

Added code to determine RPM CPU type for the host OS. This is
needed to determine that on x86-linux, RPM builds "i386" RPMs
while on Sparc/Solaris?, it builds "sparc" RPMs. Since the
buildall script installs the binutils RPM to build the gccnewlib
RPM, it needs to know this.

Location:

scripts

Files:

• buildall.in (modified) (2 diffs)
• configure.in (modified) (2 diffs)

scripts/buildall.in

@@ -7 +7 @@
 CFG=./setup.cache
 dst=@RPM_SPECSdir@
+target=@target@
+rpm_cpu=@RPM_CPU@
 
 usage()
@@ -136 +138 @@
     #    NOTE: This requires having binutils installed and we immediately
     #          remove it once finished.
-    base_binutils_rpm=${dst}/../RPMS/i386/rtems-base-binutils-${binutils}-${binutils_rpm_release}.i386.rpm
-    binutils_rpm=${dst}/../RPMS/i386/${target}-binutils-${binutils}-${binutils_rpm_release}.i386.rpm
+    base_binutils_rpm=${dst}/../RPMS/${rpm_cpu}/rtems-base-binutils-${binutils}-${binutils_rpm_release}.${rpm_cpu}.rpm
+    binutils_rpm=${dst}/../RPMS/${rpm_cpu}/${target}-binutils-${binutils}-${binutils_rpm_release}.${rpm_cpu}.rpm
     if [ ! -f ${binutils_rpm} ] ; then
       echo There is no RPM for binutils for ${target}.

scripts/configure.in

@@ -32 +32 @@
 AC_SUBST(RPM_SPECSdir)
 
+AC_CANONICAL_HOST
+
+AC_MSG_CHECKING(for RPM CPU type)
+changequote(,)dnl
+case "${host}" in
+  i[34567]86-*linux*)    RPM_CPU=i386 ;;
+  i[34567]86-pc-cygwin*) RPM_CPU=i386 ;;
+  sparc-sun-solaris*)    RPM_CPU=sparc ;;
+  *)
+    AC_MSG_ERROR(RPM CPU for ${target} is unknown)
+    ;;
+esac
+changequote([,])dnl
+AC_MSG_RESULT($RPM_CPU)
+
 GCCNEWLIBVERS="gcc-${gcc_version}-newlib-${newlib_version}"
 AC_SUBST(GCCNEWLIBVERS)
@@ -41 +56 @@
 AC_SUBST(RTEMS_VERSION)
 AC_SUBST(BSPVERS)
+AC_SUBST(RPM_CPU)
 
 AC_OUTPUT(