Changeset ab25407c in rtems

Timestamp:

10/19/99 22:02:39 (24 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

38118d3

Parents:

c5b8d6d

Message:

Easier to insert tool version number.

Location:

scripts

Files:

• gccnewlib.spec.in (modified) (6 diffs)
• mkgccnewlibspec (modified) (2 diffs)

scripts/gccnewlib.spec.in

@@ -20 +20 @@
 Packager:     corsepiu@faw.uni-ulm.de and joel@OARcorp.com
 
-Version:      @Version@
+Version:      gcc-@gcc_version@-newlib-@newlib_version@
 Summary:      rtems gcc and newlib C Library for target @target_alias@
-Source0:        gcc-2.95.1.tar.gz
-Source1:        newlib-1.8.2.tar.gz
-Patch0:         gcc-2.95.1-rtems-19991015.diff
-Patch1:         newlib-1.8.2-rtems-19991015.diff
+Source0:        gcc-@gcc_version@.tar.gz
+Source1:        newlib-@newlib_version@.tar.gz
+Patch0:         gcc-@gcc_version@-rtems-@gcc_patch_version@.diff
+Patch1:         newlib-@newlib_version@-rtems-@newlib_patch_version@.diff
 
 Buildroot:    /tmp
@@ -40 +40 @@
 
 %prep
-# untar the sources inside @target_alias@-gcc-newlib -@Version@
+# untar the sources inside @target_alias@-gcc-newlib
 %setup -c -n @target_alias@-gcc-newlib -a 0 -a 1
 
@@ -46 +46 @@
 %patch1 -p0
 
-( cd gcc-2.95.1
+( cd gcc-@gcc_version@
 
   # Now link the C library into the source tree 
-  ln -s ../newlib-1.8.2/newlib .
+  ln -s ../newlib-@newlib_version@/newlib .
 )
 
@@ -55 +55 @@
 test -d build || mkdir build
 ( cd build
-  ../gcc-2.95.1/configure --target=@target_alias@ \
+  ../gcc-@gcc_version@/configure --target=@target_alias@ \
     --with-gnu-as --with-gnu-ld --with-newlib --verbose \
     --prefix=/opt/rtems 
@@ -70 +70 @@
     || mkdir $RPM_BUILD_ROOT/opt/rtems/@target_alias@/sys-include
 
-  srclimits=../gcc-2.95.1/newlib/libc/sys/rtems/include/limits.h
+  srclimits=../gcc-@gcc_version@/newlib/libc/sys/rtems/include/limits.h
   for dir in $RPM_BUILD_ROOT/opt/rtems/@target_alias@/include \
              $RPM_BUILD_ROOT/opt/rtems/@target_alias@/sys-include
@@ -112 +112 @@
 /opt/rtems/bin/@target_alias@-gcc
 /opt/rtems/bin/@target_alias@-gcj
-/opt/rtems/lib/gcc-lib/@target_alias@/2.95.1
+/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@
 /opt/rtems/@target_alias@/include*
 /opt/rtems/@target_alias@/sys-include

scripts/mkgccnewlibspec

@@ -5 +5 @@
 
 RTEMS_DIR=`dirname $0`
-RTEMS_VERSION=`grep Version ${RTEMS_DIR}/../VERSION | \
-sed -e 's%RTEMS[        ]*Version[      ]*\(.*\)[       ]*%\1%g'`
 
 target_alias=$1
-release=0
+
+# RPM release number
+rpm_release=0
+
+# gcc version number
+gcc_version=2.95.1
+gcc_patch_version=19991015
+
+# newlib version number
+newlib_version=1.8.2
+newlib_patch_version=19991015
 
 # Some linux distributions use /usr/src/packages
@@ -25 +33 @@
 fi
 
-sed -e "s%@Version@%${RTEMS_VERSION}%g" \
--e "s%@bsp@%${bsp}%g" \
--e "s%@Release@%${release}%g" \
--e "s%@target_alias@%${target_alias}%g" \
+specfile=${dst}/$target_alias-gcc-${gcc_version}-newlib-${newlib_version}.spec
+sed -e "s%@Release@%${rpm_release}%g" \
+    -e "s%@target_alias@%${target_alias}%g" \
+    -e "s%@gcc_version@%${gcc_version}%g" \
+    -e "s%@gcc_patch_version@%${gcc_patch_version}%g" \
+    -e "s%@newlib_version@%${newlib_version}%g" \
+    -e "s%@newlib_patch_version@%${newlib_patch_version}%g" \
 < ${RTEMS_DIR}/gccnewlib.spec.in \
-> ${dst}/$target_alias-gcc_newlib.spec
+> ${specfile}
 
-echo Generated ${dst}/$target_alias-gcc_newlib.spec.
+echo Generated ${specfile}.