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.
This commit is contained in:
Ralf Corsepius
2002-11-25 15:24:05 +00:00
parent e4eb1beab7
commit d35b77f021
2 changed files with 18 additions and 8 deletions

View File

@@ -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> 2002-11-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* binutils/binutils.add: Add BuildPreReq: /sbin/install-info. * binutils/binutils.add: Add BuildPreReq: /sbin/install-info.

View File

@@ -117,8 +117,12 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
@PATCH2@ @PATCH2@
@PATCH4@ @PATCH4@
# Fix timestamps
cd gcc-@gcc_version@ 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 contrib/gcc_update --touch
cd .. cd ..
@@ -214,10 +218,9 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
%endif %endif
# Bug in gcc-3.x: It puts the build dirs into *.la files # 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 # host library
rm -f $i rm -f ${RPM_BUILD_ROOT}%{_prefix}/lib/libiberty.a
done
%if "@gcc_version@" < "3.0" %if "@gcc_version@" < "3.0"
# Bug in gcc-2.95.x: It bogusly tries to share cpp for all targets. # 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"`; f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
for i in $f; do for i in $f; do
case $i in 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) ;; *f771) ;;
*cc1obj) ;; *cc1obj) ;;
*libobjc*) echo "$i" >> files.objc ;; *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"`; f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
for i in $f; do for i in $f; do
case $i in case $i in
*lib*.la);; # ignore - gcc produces bogus libtool libs *lib*.la) rm ${RPM_BUILD_ROOT}/$i;; # ignore - gcc produces bogus libtool libs
*libiberty.a) ;; # ignore - GPL'ed *libiberty.a) rm ${RPM_BUILD_ROOT}/$i ;; # ignore - GPL'ed
# all other files belong to gcc # all other files belong to gcc
*) echo "$i" >> files.gcc ;; *) echo "$i" >> files.gcc ;;
esac esac