diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2008-11-06 07:36:41 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2008-11-06 07:36:41 +0000 |
| commit | d3ae4470ac2919b77974a4f7a22f09a0d2769674 (patch) | |
| tree | 50c16a23822d08a7732cd8ac65194c75d77bed3b /contrib/crossrpms/gcc | |
| parent | Remove cpukit (Unsupported). (diff) | |
| download | rtems-d3ae4470ac2919b77974a4f7a22f09a0d2769674.tar.bz2 | |
Sync with CVS-HEAD.
Diffstat (limited to 'contrib/crossrpms/gcc')
| -rw-r--r-- | contrib/crossrpms/gcc/build.add | 3 | ||||
| -rw-r--r-- | contrib/crossrpms/gcc/prep.add | 2 | ||||
| -rw-r--r-- | contrib/crossrpms/gcc/rpm-install.add | 23 |
3 files changed, 26 insertions, 2 deletions
diff --git a/contrib/crossrpms/gcc/build.add b/contrib/crossrpms/gcc/build.add index 23ea9f9cce..3dbd9b39b0 100644 --- a/contrib/crossrpms/gcc/build.add +++ b/contrib/crossrpms/gcc/build.add @@ -32,7 +32,8 @@ CFLAGS_FOR_BUILD="-g -O2 -Wall" \ CC="%{_host}-gcc ${RPM_OPT_FLAGS}" \ %else - CC="%{__cc} ${RPM_OPT_FLAGS}" \ +# gcc is not ready to be compiled with -std=gnu99 + CC=$(echo "%{__cc} ${RPM_OPT_FLAGS}" | sed -e 's,-std=gnu99 ,,') \ %endif ../gcc-%{gcc_pkgvers}/configure \ --prefix=%{_prefix} \ diff --git a/contrib/crossrpms/gcc/prep.add b/contrib/crossrpms/gcc/prep.add index 4934b23374..4413603897 100644 --- a/contrib/crossrpms/gcc/prep.add +++ b/contrib/crossrpms/gcc/prep.add @@ -25,7 +25,7 @@ %endif %if %build_objc -%setup -T -D -n %{name}-%{version} -a5 +%setup -q -T -D -n %{name}-%{version} -a5 %{?PATCH5:%patch5 -p0} %endif diff --git a/contrib/crossrpms/gcc/rpm-install.add b/contrib/crossrpms/gcc/rpm-install.add index 002ecff610..b6014fd66a 100644 --- a/contrib/crossrpms/gcc/rpm-install.add +++ b/contrib/crossrpms/gcc/rpm-install.add @@ -47,3 +47,26 @@ EOF chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires %define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires + +# Extract %%__debug_install_post into debug_install_post~ +cat << \EOF > debug_install_post~ +%__debug_install_post +EOF + +# Generate customized debug_install_post script +cat debug_install_post~ | while read a x y; do +case $a in +# Prevent find-debuginfo.sh* from trying to handle foreign binaries +*/find-debuginfo.sh) + b=$(basename $a) + sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b + chmod a+x $b + ;; +esac +done + +sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ +< debug_install_post~ > debug_install_post +%define __debug_install_post . ./debug_install_post + + |