summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2002-11-25 15:24:05 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2002-11-25 15:24:05 +0000
commitd35b77f0213b8e4dba1b49cdc3598c6def79808f (patch)
treea4d094d5b54d10c39d46216768b01a23f73c2602 /scripts
parent2002-11-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-d35b77f0213b8e4dba1b49cdc3598c6def79808f.tar.bz2
2002-11-25 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* gcc3newlib/gccnewlib.add: Remove *.la's to make rpm-4.1/RH-8.0 happy. Remove libiberty.a to make rpm-4.1/RH-8.0 happy. Change gcc/version.c to reflect us having patched gcc.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/ChangeLog7
-rw-r--r--scripts/gcc3newlib/gccnewlib.add19
2 files changed, 18 insertions, 8 deletions
diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index ba41d5c173..ebc53749ce 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,10 @@
+2002-11-25 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * gcc3newlib/gccnewlib.add:
+ Remove *.la's to make rpm-4.1/RH-8.0 happy.
+ Remove libiberty.a to make rpm-4.1/RH-8.0 happy.
+ Change gcc/version.c to reflect us having patched gcc.
+
2002-11-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* binutils/binutils.add: Add BuildPreReq: /sbin/install-info.
diff --git a/scripts/gcc3newlib/gccnewlib.add b/scripts/gcc3newlib/gccnewlib.add
index a948393d6a..f0ceb2ce26 100644
--- a/scripts/gcc3newlib/gccnewlib.add
+++ b/scripts/gcc3newlib/gccnewlib.add
@@ -117,8 +117,12 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
@PATCH2@
@PATCH4@
- # Fix timestamps
cd gcc-@gcc_version@
+ sed -e 's/\(version_string = \"[^\"]*\)/\1 (OAR Corporation gcc-@gcc_version@-@gcc_patch_version@\/newlib-@newlib_version@-@newlib_patch_version@ @Release@)/' \
+ gcc/version.c > gcc/version.c~
+ mv gcc/version.c~ gcc/version.c
+
+ # Fix timestamps
contrib/gcc_update --touch
cd ..
@@ -214,10 +218,9 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
%endif
# Bug in gcc-3.x: It puts the build dirs into *.la files
- files=`find ${RPM_BUILD_ROOT}%{_prefix}/@target_alias@/lib -name '*.la'`
- test -n "$files" && for i in $files; do
- rm -f $i
- done
+
+ # host library
+ rm -f ${RPM_BUILD_ROOT}%{_prefix}/lib/libiberty.a
%if "@gcc_version@" < "3.0"
# Bug in gcc-2.95.x: It bogusly tries to share cpp for all targets.
@@ -273,7 +276,7 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
for i in $f; do
case $i in
- *lib*.la);; # ignore: gcc produces bogus libtool libs
+ *lib*.la) rm ${RPM_BUILD_ROOT}/$i ;; # ignore: gcc produces bogus libtool libs
*f771) ;;
*cc1obj) ;;
*libobjc*) echo "$i" >> files.objc ;;
@@ -296,8 +299,8 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
for i in $f; do
case $i in
- *lib*.la);; # ignore - gcc produces bogus libtool libs
- *libiberty.a) ;; # ignore - GPL'ed
+ *lib*.la) rm ${RPM_BUILD_ROOT}/$i;; # ignore - gcc produces bogus libtool libs
+ *libiberty.a) rm ${RPM_BUILD_ROOT}/$i ;; # ignore - GPL'ed
# all other files belong to gcc
*) echo "$i" >> files.gcc ;;
esac