change log for rtems (2011-08-06)

rtems-vc at rtems.org rtems-vc at rtems.org
Sat Aug 6 06:15:00 UTC 2011


 *ralf* (on branch rtems-4-9-branch):
Remove Obsoletes/Provides.

M 1.9.2.2  contrib/crossrpms/gcc/target-c++.add
M 1.8.8.2  contrib/crossrpms/gcc/target-gfortran.add
M 1.7.8.1  contrib/crossrpms/gcc/target-objc.add

diff -u rtems/contrib/crossrpms/gcc/target-c++.add:1.9.2.1 rtems/contrib/crossrpms/gcc/target-c++.add:1.9.2.2
--- rtems/contrib/crossrpms/gcc/target-c++.add:1.9.2.1	Sat Feb  7 03:26:19 2009
+++ rtems/contrib/crossrpms/gcc/target-c++.add	Sat Aug  6 00:13:08 2011
@@ -11,8 +11,6 @@
 %if "%{_build}" != "%{_host}"
 BuildRequires:  @rpmprefix@@tool_target at -gcc-c++ = %{gcc_rpmvers}
 %endif
-Provides:	@rpmprefix@@tool_target at -c++ = %{gcc_rpmvers}-%{release}
-Obsoletes:	@rpmprefix@@tool_target at -c++ < %{gcc_rpmvers}-%{release}
 
 %if %build_infos
 Requires:       @rpmprefix at gcc-common

diff -u rtems/contrib/crossrpms/gcc/target-gfortran.add:1.8.8.1 rtems/contrib/crossrpms/gcc/target-gfortran.add:1.8.8.2
--- rtems/contrib/crossrpms/gcc/target-gfortran.add:1.8.8.1	Fri Nov 27 01:17:05 2009
+++ rtems/contrib/crossrpms/gcc/target-gfortran.add	Sat Aug  6 00:13:08 2011
@@ -8,14 +8,10 @@
 Version:        %{gcc_rpmvers}
 License:	GPL
 
-Provides:	@rpmprefix@@tool_target at -gfortran = %{gcc_rpmvers}-%{release}
-Obsoletes:	@rpmprefix@@tool_target at -gfortran < %{gcc_rpmvers}-%{release}
-
 %if %build_infos
 Requires:       @rpmprefix at gcc-gfortran-common
 %endif
-Requires:       @rpmprefix@@tool_target at -gcc = %{gcc_rpmvers}-%{release}
-Obsoletes:      @rpmprefix@@tool_target at -g77 < %{gcc_rpmvers}-%{release}
+Requires:       @rpmprefix@@tool_target at -gcc-libgfortran = %{gcc_rpmvers}-%{release}
 
 %description -n @rpmprefix@@tool_target at -gcc-gfortran
 GCC fortran compiler for @tool_target at .

diff -u rtems/contrib/crossrpms/gcc/target-objc.add:1.7 rtems/contrib/crossrpms/gcc/target-objc.add:1.7.8.1
--- rtems/contrib/crossrpms/gcc/target-objc.add:1.7	Sun Jul 23 09:19:14 2006
+++ rtems/contrib/crossrpms/gcc/target-objc.add	Sat Aug  6 00:13:08 2011
@@ -7,8 +7,6 @@
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 License:	GPL
-Provides:	@rpmprefix@@tool_target at -objc = %{gcc_rpmvers}-%{release}
-Obsoletes:	@rpmprefix@@tool_target at -objc < %{gcc_rpmvers}-%{release}
 
 Requires:       @rpmprefix@@tool_target at -gcc = %{gcc_rpmvers}-%{release}
 


 *ralf* (on branch rtems-4-9-branch):
Abandon gcc-3.3/3.4

M 1.15.2.1  contrib/crossrpms/gcc/base-gcc.add
M 1.11.4.1  contrib/crossrpms/gcc/base-gcj.add
M 1.25.2.3  contrib/crossrpms/gcc/gccnewlib.add
M 1.15.4.4  contrib/crossrpms/gcc/install.add
M 1.15.2.3  contrib/crossrpms/gcc/target-gcc.add
M 1.8.8.1  contrib/crossrpms/gcc/target-gcj.add

diff -u rtems/contrib/crossrpms/gcc/base-gcc.add:1.15 rtems/contrib/crossrpms/gcc/base-gcc.add:1.15.2.1
--- rtems/contrib/crossrpms/gcc/base-gcc.add:1.15	Fri Apr 25 10:19:47 2008
+++ rtems/contrib/crossrpms/gcc/base-gcc.add	Sat Aug  6 00:25:40 2011
@@ -22,16 +22,9 @@
 %{_infodir}/cppinternals.info*
 %{_infodir}/gcc.info*
 %{_infodir}/gccint.info*
-%if "%{gcc_version}" >= "3.4"
 %{_infodir}/gccinstall.info*
-%endif
 
 %sysdir %{_mandir}
-%if "%{gcc_version}" < "3.4"
-%sysdir %{_mandir}/man1
-%{_mandir}/man1/cpp.1*
-%{_mandir}/man1/gcov.1*
-%endif
 %sysdir %{_mandir}/man7
 %{_mandir}/man7/fsf-funding.7*
 %{_mandir}/man7/gfdl.7*
@@ -42,9 +35,7 @@
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-%if "%{gcc_version}" >= "3.4"
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-%endif
 
 %preun -n @rpmprefix at gcc-common
 if [ $1 -eq 0 ]; then
@@ -52,9 +43,7 @@
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
-%if "%{gcc_version}" >= "3.4"
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
-%endif
 fi
 
 %endif

diff -u rtems/contrib/crossrpms/gcc/base-gcj.add:1.11 rtems/contrib/crossrpms/gcc/base-gcj.add:1.11.4.1
--- rtems/contrib/crossrpms/gcc/base-gcj.add:1.11	Sun Jul 22 02:08:30 2007
+++ rtems/contrib/crossrpms/gcc/base-gcj.add	Sat Aug  6 00:25:40 2011
@@ -19,21 +19,13 @@
 
 %files -n @rpmprefix at gcc-gcj-common
 %defattr(-,root,root)
-%if "%{gcc_version}" <= "3.4"
-%sysdir %{_bindir}
-%{_bindir}/jar%{_exeext}
-%{_bindir}/grepjar%{_exeext}
-%endif
 
 %sysdir %{_infodir}
 %ghost %{_infodir}/dir
 %{_infodir}/gcj.info*
-%if "%{gcc_version}" >= "3.3"
 %{_infodir}/fastjar.info*
-%endif
 
 %if "%{gcc_version}" < "4.0"
-%if "%{gcc_version}" >= "3.3"
 %sysdir %{_mandir}
 %sysdir %{_mandir}/man1
 %{_mandir}/man1/gcjh.1*
@@ -46,22 +38,15 @@
 %{_mandir}/man1/jar.1*
 %{_mandir}/man1/grepjar.1*
 %endif
-%endif
 
 %post -n @rpmprefix at gcc-gcj-common
 /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcj.info* || :
-
-%if "%{gcc_version}" >= "3.3"
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/fastjar.info* || :
-%endif
+/sbin/install-info --info-dir=%{_infodir} %{_infodir}/fastjar.info* || :
 
 %preun -n @rpmprefix at gcc-gcj-common
 if [ $1 -eq 0 ]; then
 /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcj.info* || :
-
-%if "%{gcc_version}" >= "3.3"
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/fastjar.info* || :
-%endif
+/sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/fastjar.info* || :
 fi
 
 %endif

diff -u rtems/contrib/crossrpms/gcc/gccnewlib.add:1.25.2.2 rtems/contrib/crossrpms/gcc/gccnewlib.add:1.25.2.3
--- rtems/contrib/crossrpms/gcc/gccnewlib.add:1.25.2.2	Fri Nov 27 01:17:05 2009
+++ rtems/contrib/crossrpms/gcc/gccnewlib.add	Sat Aug  6 00:33:39 2011
@@ -80,7 +80,6 @@
 %endif
 %if %build_gnat
 # Building gnat requires gnat
-# This really isn't available until RedHat 8.0.  How to conditionalize this?
 BuildRequires:	gcc-gnat
 BuildRequires:	@rpmprefix@@tool_target at -newlib < %{newlib_version}- at NEWLIB_RPMREL@
 %endif
@@ -88,13 +87,8 @@
 BuildRequires: gmp-devel
 %endif
 
-%if "%{gcc_version}" >= "3.4"
 %define gcclib %{_libdir}/gcc
 %define gccexec %{_libexecdir}/gcc
-%else
-%define gcclib %{_libdir}/gcc-lib
-%define gccexec %{_libdir}/gcc-lib
-%endif
 
 @SOURCES@
 

diff -u rtems/contrib/crossrpms/gcc/install.add:1.15.4.3 rtems/contrib/crossrpms/gcc/install.add:1.15.4.4
--- rtems/contrib/crossrpms/gcc/install.add:1.15.4.3	Fri Nov 27 01:17:05 2009
+++ rtems/contrib/crossrpms/gcc/install.add	Sat Aug  6 00:25:40 2011
@@ -51,17 +51,13 @@
 #  mv $RPM_BUILD_ROOT%{_bindir}/gfortran $RPM_BUILD_ROOT%{_bindir}/@tool_target at -gfortran
 %endif
 
-%if "%{gcc_version}" >= "3.4"
   # Bug in gcc-3.4.0pre
   rm -f $RPM_BUILD_ROOT%{_bindir}/@tool_target at -@tool_target at -gcjh%{_exeext}
-%endif
 
-%if "%{gcc_version}" >= "3.3"
   # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
   # the fixinclude-install-tools
   rm -rf ${RPM_BUILD_ROOT}%{gcclib}/@tool_target@/%{gcc_version}/install-tools
   rm -rf ${RPM_BUILD_ROOT}%{gccexec}/@tool_target@/%{gcc_version}/install-tools
-%endif
 
   # Bug in gcc > 4.1.0: Installs an unused, empty directory
   if test -d ${RPM_BUILD_ROOT}%{_prefix}/@tool_target@/include/bits; then

diff -u rtems/contrib/crossrpms/gcc/target-gcc.add:1.15.2.2 rtems/contrib/crossrpms/gcc/target-gcc.add:1.15.2.3
--- rtems/contrib/crossrpms/gcc/target-gcc.add:1.15.2.2	Sat Feb  7 03:26:19 2009
+++ rtems/contrib/crossrpms/gcc/target-gcc.add	Sat Aug  6 00:25:41 2011
@@ -21,17 +21,13 @@
 %sysdir %{_mandir}
 %sysdir %{_mandir}/man1
 %{_mandir}/man1/@tool_target at -gcc.1*
-%if "%{gcc_version}" >= "3.4"
 %{_mandir}/man1/@tool_target at -cpp.1*
 %{_mandir}/man1/@tool_target at -gcov.1*
-%endif
 
 %sysdir %{_bindir}
 %{_bindir}/@tool_target at -cpp%{_exeext}
 %{_bindir}/@tool_target at -gcc%{_exeext}
-%if "%{gcc_version}" >= "3.3"
 %{_bindir}/@tool_target at -gcc-%{gcc_version}%{_exeext}
-%endif
 %{_bindir}/@tool_target at -gcov%{_exeext}
 %{_bindir}/@tool_target at -gccbug
 

diff -u rtems/contrib/crossrpms/gcc/target-gcj.add:1.8 rtems/contrib/crossrpms/gcc/target-gcj.add:1.8.8.1
--- rtems/contrib/crossrpms/gcc/target-gcj.add:1.8	Sun Jul 23 09:18:56 2006
+++ rtems/contrib/crossrpms/gcc/target-gcj.add	Sat Aug  6 00:25:41 2011
@@ -25,8 +25,6 @@
 %{_bindir}/@tool_target at -jcf-dump%{_exeext}
 %{_bindir}/@tool_target at -jv-scan%{_exeext}
 %{_bindir}/@tool_target at -gcjh%{_exeext}
-
-%if "%{gcc_version}" >= "3.4"
 %{_bindir}/@tool_target at -*jar%{_exeext}
 
 %{_mandir}/man1/@tool_target at -*jar.1*
@@ -34,15 +32,12 @@
 %{_mandir}/man1/@tool_target at -jv-*.1*
 %{_mandir}/man1/@tool_target at -jcf-dump.1*
 %{_mandir}/man1/@tool_target at -gij.1*
-%endif
 
 %if "%{gcc_version}" >= "4.0"
 %{_mandir}/man1/@tool_target at -grmi*.1*
 %else
-%if "%{gcc_version}" >= "3.4"
 %{_mandir}/man1/@tool_target at -rmi*.1*
 %endif
-%endif
 
 %dir %{gccexec}
 %dir %{gccexec}/@tool_target@
@@ -51,4 +46,3 @@
 %{gccexec}/@tool_target@/%{gcc_version}/jvgenmain%{_exeext}
 
 %endif
-


 *ralf* (on branch rtems-4-9-branch):
Eliminate gcclib.

M 1.25.2.4  contrib/crossrpms/gcc/gccnewlib.add
M 1.15.4.5  contrib/crossrpms/gcc/install.add
M 1.8.6.3  contrib/crossrpms/gcc/rpm-install.add
M 1.9.2.3  contrib/crossrpms/gcc/target-c++.add
M 1.15.2.4  contrib/crossrpms/gcc/target-gcc.add
M 1.8.8.1  contrib/crossrpms/gcc/target-gnat.add
M 1.7.8.2  contrib/crossrpms/gcc/target-objc.add

diff -u rtems/contrib/crossrpms/gcc/gccnewlib.add:1.25.2.3 rtems/contrib/crossrpms/gcc/gccnewlib.add:1.25.2.4
--- rtems/contrib/crossrpms/gcc/gccnewlib.add:1.25.2.3	Sat Aug  6 00:33:39 2011
+++ rtems/contrib/crossrpms/gcc/gccnewlib.add	Sat Aug  6 00:42:57 2011
@@ -87,8 +87,8 @@
 BuildRequires: gmp-devel
 %endif
 
-%define gcclib %{_libdir}/gcc
 %define gccexec %{_libexecdir}/gcc
+%global _gcclibdir %{_prefix}/lib
 
 @SOURCES@
 

diff -u rtems/contrib/crossrpms/gcc/install.add:1.15.4.4 rtems/contrib/crossrpms/gcc/install.add:1.15.4.5
--- rtems/contrib/crossrpms/gcc/install.add:1.15.4.4	Sat Aug  6 00:25:40 2011
+++ rtems/contrib/crossrpms/gcc/install.add	Sat Aug  6 00:42:57 2011
@@ -19,7 +19,7 @@
 # Misplaced header file
   if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
     mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
-      $RPM_BUILD_ROOT%{gcclib}/@tool_target@/%{gcc_version}/include/
+      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include/
   fi
 %endif
 
@@ -56,7 +56,7 @@
 
   # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
   # the fixinclude-install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{gcclib}/@tool_target@/%{gcc_version}/install-tools
+  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/install-tools
   rm -rf ${RPM_BUILD_ROOT}%{gccexec}/@tool_target@/%{gcc_version}/install-tools
 
   # Bug in gcc > 4.1.0: Installs an unused, empty directory
@@ -89,10 +89,10 @@
   echo "%dir %{_libexecdir}" >> dirs
 %endif
 %endif
-  echo "%dir %{gcclib}" >> dirs
-  echo "%dir %{gcclib}/@tool_target@" >> dirs
+  echo "%dir %{_gcclibdir}/gcc" >> dirs
+  echo "%dir %{_gcclibdir}/gcc/@tool_target@" >> dirs
 
-  TGTDIR="%{gcclib}/@tool_target@/%{gcc_version}"
+  TGTDIR="%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}"
   for i in $f; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> dirs
@@ -109,7 +109,7 @@
   cp dirs build/files.gcj
   cp dirs build/files.g++
 
-  TGTDIR="%{gcclib}/@tool_target@/%{gcc_version}"
+  TGTDIR="%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}"
   f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
   for i in $f; do
     case $i in

diff -u rtems/contrib/crossrpms/gcc/rpm-install.add:1.8.6.2 rtems/contrib/crossrpms/gcc/rpm-install.add:1.8.6.3
--- rtems/contrib/crossrpms/gcc/rpm-install.add:1.8.6.2	Mon Nov 10 07:06:03 2008
+++ rtems/contrib/crossrpms/gcc/rpm-install.add	Sat Aug  6 00:42:57 2011
@@ -34,7 +34,7 @@
 cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/@tool_target@/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/@tool_target@/' | %__find_provides
+  | grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/@tool_target@/' | %__find_provides
 EOF
 chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
 %define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
@@ -42,7 +42,7 @@
 cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/@tool_target@/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/@tool_target@/' | %__find_requires
+  | grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/@tool_target@/' | %__find_requires
 EOF
 chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
 %define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires

diff -u rtems/contrib/crossrpms/gcc/target-c++.add:1.9.2.2 rtems/contrib/crossrpms/gcc/target-c++.add:1.9.2.3
--- rtems/contrib/crossrpms/gcc/target-c++.add:1.9.2.2	Sat Aug  6 00:13:08 2011
+++ rtems/contrib/crossrpms/gcc/target-c++.add	Sat Aug  6 00:42:57 2011
@@ -32,7 +32,7 @@
 %dir %{gccexec}/@tool_target@/%{gcc_version}
 %{gccexec}/@tool_target@/%{gcc_version}/cc1plus%{_exeext}
 
-%dir %{gcclib}/@tool_target@/%{gcc_version}/include
-%{gcclib}/@tool_target@/%{gcc_version}/include/c++
+%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include
+%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include/c++
 %endif
 

diff -u rtems/contrib/crossrpms/gcc/target-gcc.add:1.15.2.3 rtems/contrib/crossrpms/gcc/target-gcc.add:1.15.2.4
--- rtems/contrib/crossrpms/gcc/target-gcc.add:1.15.2.3	Sat Aug  6 00:25:41 2011
+++ rtems/contrib/crossrpms/gcc/target-gcc.add	Sat Aug  6 00:42:58 2011
@@ -31,17 +31,17 @@
 %{_bindir}/@tool_target at -gcov%{_exeext}
 %{_bindir}/@tool_target at -gccbug
 
-%dir %{gcclib}/@tool_target@/%{gcc_version}/include
+%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include
 %if "%{gcc_version}" > "4.0.3"
 %if "@tool_target@" != "bfin-rtems at rtems_api@"
 %if "@tool_target@" != "avr-rtems at rtems_api@"
-%dir %{gcclib}/@tool_target@/%{gcc_version}/include/ssp
+%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include/ssp
 %endif
 %endif
 %endif
 
 %if "%{gcc_version}" >= "4.3.0"
-%dir %{gcclib}/@tool_target@/%{gcc_version}/include-fixed
+%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include-fixed
 %endif
 
 %dir %{gccexec}

diff -u rtems/contrib/crossrpms/gcc/target-gnat.add:1.8 rtems/contrib/crossrpms/gcc/target-gnat.add:1.8.8.1
--- rtems/contrib/crossrpms/gcc/target-gnat.add:1.8	Sun Jul 23 09:18:39 2006
+++ rtems/contrib/crossrpms/gcc/target-gnat.add	Sat Aug  6 00:42:58 2011
@@ -29,7 +29,7 @@
 %dir %{gccexec}/@tool_target@/%{gcc_version}
 %{gccexec}/@tool_target@/%{gcc_version}/gnat1%{_exeext}
 
-%{gcclib}/@tool_target@/%{gcc_version}/adalib
-%{gcclib}/@tool_target@/%{gcc_version}/adainclude
+%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/adalib
+%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/adainclude
 %endif
 

diff -u rtems/contrib/crossrpms/gcc/target-objc.add:1.7.8.1 rtems/contrib/crossrpms/gcc/target-objc.add:1.7.8.2
--- rtems/contrib/crossrpms/gcc/target-objc.add:1.7.8.1	Sat Aug  6 00:13:08 2011
+++ rtems/contrib/crossrpms/gcc/target-objc.add	Sat Aug  6 00:42:58 2011
@@ -21,6 +21,6 @@
 %dir %{gccexec}/@tool_target@/%{gcc_version}
 %{gccexec}/@tool_target@/%{gcc_version}/cc1obj%{_exeext}
 
-%{gcclib}/@tool_target@/%{gcc_version}/include/objc
+%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include/objc
 %endif
 


 *ralf* (on branch rtems-4-9-branch):
Merger from CVS-HEAD.

M 1.5.2.3  contrib/crossrpms/gcc/prep.add
M 1.8.6.4  contrib/crossrpms/gcc/rpm-install.add

diff -u rtems/contrib/crossrpms/gcc/prep.add:1.5.2.2 rtems/contrib/crossrpms/gcc/prep.add:1.5.2.3
--- rtems/contrib/crossrpms/gcc/prep.add:1.5.2.2	Fri Nov 27 01:13:21 2009
+++ rtems/contrib/crossrpms/gcc/prep.add	Sat Aug  6 00:46:25 2011
@@ -2,11 +2,15 @@
 %setup -c -T -n %{name}-%{version}
 
 %setup -q -T -D -n %{name}-%{version} -a0
-%{?PATCH0:%patch0 -p0}
+cd gcc-%{gcc_pkgvers}
+%{?PATCH0:%patch0 -p1}
+cd ..
 
 %if %build_cxx
 %setup -q -T -D -n %{name}-%{version} -a1
-%{?PATCH1:%patch1 -p0}
+cd gcc-%{gcc_pkgvers}
+%{?PATCH1:%patch1 -p1}
+cd ..
 %endif
 
 %if %build_fortran

diff -u rtems/contrib/crossrpms/gcc/rpm-install.add:1.8.6.3 rtems/contrib/crossrpms/gcc/rpm-install.add:1.8.6.4
--- rtems/contrib/crossrpms/gcc/rpm-install.add:1.8.6.3	Sat Aug  6 00:42:57 2011
+++ rtems/contrib/crossrpms/gcc/rpm-install.add	Sat Aug  6 00:47:22 2011
@@ -34,7 +34,7 @@
 cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/@tool_target@/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/@tool_target@/' | %__find_provides
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/@tool_target@/'} | %__find_provides
 EOF
 chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
 %define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
@@ -42,7 +42,7 @@
 cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/@tool_target@/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/@tool_target@/' | %__find_requires
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/@tool_target@/'} | %__find_requires
 EOF
 chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
 %define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires



--

Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20110806/014fbf64/attachment.html>


More information about the vc mailing list