diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2007-05-24 06:10:44 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2007-05-24 06:10:44 +0000 |
| commit | b37b79a5ffc5860c317196b0294e1c970173816d (patch) | |
| tree | 482bcf536eac3e6bb6b64f6a4e8792512463585a | |
| parent | Partial merger from HEAD. (diff) | |
| download | rtems-b37b79a5ffc5860c317196b0294e1c970173816d.tar.bz2 | |
Update from HEAD.
| -rw-r--r-- | contrib/crossrpms/gcc/build.add | 3 | ||||
| -rw-r--r-- | contrib/crossrpms/gcc/install.add | 4 | ||||
| -rw-r--r-- | contrib/crossrpms/gcc/rpm-install.add | 4 | ||||
| -rw-r--r-- | contrib/crossrpms/gcc/target-newlib.add | 4 |
4 files changed, 8 insertions, 7 deletions
diff --git a/contrib/crossrpms/gcc/build.add b/contrib/crossrpms/gcc/build.add index a531b1b6af..ca2103b7cc 100644 --- a/contrib/crossrpms/gcc/build.add +++ b/contrib/crossrpms/gcc/build.add @@ -33,6 +33,7 @@ ../gcc-%{gcc_pkgvers}/configure \ --prefix=%{_prefix} \ --bindir=%{_bindir} \ + --exec_prefix=%{_exec_prefix} \ --includedir=%{_includedir} \ --libdir=%{_libdir} \ --libexecdir=%{_libexecdir} \ @@ -48,7 +49,7 @@ --disable-win32-registry \ --enable-version-specific-runtime-libs \ --enable-threads \ - --with-sysroot=%{_prefix}/@tool_target@/sys-root \ + --with-sysroot=%{_exec_prefix}/@tool_target@/sys-root \ --enable-languages="$languages" $optargs %if "%_host" != "%_build" diff --git a/contrib/crossrpms/gcc/install.add b/contrib/crossrpms/gcc/install.add index 98a16b9ddc..4ccf93f142 100644 --- a/contrib/crossrpms/gcc/install.add +++ b/contrib/crossrpms/gcc/install.add @@ -68,7 +68,7 @@ %if %build_newlib echo "%defattr(-,root,root,-)" > build/files.newlib - TGTDIR="%{_prefix}/@tool_target@/lib" + TGTDIR="%{_exec_prefix}/@tool_target@/lib" for i in $f; do case $i in \.) echo "%dir ${TGTDIR}" >> build/files.newlib @@ -136,7 +136,7 @@ esac done - TGTDIR="%{_prefix}/@tool_target@/lib" + TGTDIR="%{_exec_prefix}/@tool_target@/lib" 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 --git a/contrib/crossrpms/gcc/rpm-install.add b/contrib/crossrpms/gcc/rpm-install.add index f8d012f8fc..002ecff610 100644 --- a/contrib/crossrpms/gcc/rpm-install.add +++ b/contrib/crossrpms/gcc/rpm-install.add @@ -33,7 +33,7 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides #!/bin/sh -grep -E -v '^${RPM_BUILD_ROOT}%{_prefix}/@tool_target@/(lib|include|sys-root)' \ +grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/@tool_target@/(lib|include|sys-root)' \ | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/@tool_target@/' | %__find_provides EOF chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides @@ -41,7 +41,7 @@ chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires #!/bin/sh -grep -E -v '^${RPM_BUILD_ROOT}%{_prefix}/@tool_target@/(lib|include|sys-root)' \ +grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/@tool_target@/(lib|include|sys-root)' \ | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/@tool_target@/' | %__find_requires EOF chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires diff --git a/contrib/crossrpms/gcc/target-newlib.add b/contrib/crossrpms/gcc/target-newlib.add index fc4fec232d..e40908d21a 100644 --- a/contrib/crossrpms/gcc/target-newlib.add +++ b/contrib/crossrpms/gcc/target-newlib.add @@ -21,7 +21,7 @@ Newlib C Library for @tool_target@. %files -n @rpmprefix@@tool_target@-newlib -f build/files.newlib %defattr(-,root,root) %sysdir %{_prefix} -%dir %{_prefix}/@tool_target@ -%{_prefix}/@tool_target@/include +%dir %{_exec_prefix}/@tool_target@ +%{_exec_prefix}/@tool_target@/include %endif |