mirror of
https://gitlab.rtems.org/rtems/rtos/rtems.git
synced 2026-09-27 16:28:34 +08:00
Eliminate @PATCH2@, @PATCH4@.
This commit is contained in:
@@ -159,9 +159,8 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
|
|||||||
%prep
|
%prep
|
||||||
# untar the sources inside %{gcc_target}-gcc-newlib
|
# untar the sources inside %{gcc_target}-gcc-newlib
|
||||||
%setup -c -T -n %{name}-%{version} -a0 -a1
|
%setup -c -T -n %{name}-%{version} -a0 -a1
|
||||||
|
%{?PATCH0:%patch0 -p0}
|
||||||
@PATCH2@
|
%{?PATCH1:%patch1 -p0}
|
||||||
@PATCH4@
|
|
||||||
|
|
||||||
cd gcc-%{gcc_version}
|
cd gcc-%{gcc_version}
|
||||||
sed -e 's/\(version_string = \"[^\"]*\)/\1 (RTEMS gcc-%{gcc_version}-@gcc_patch_version@\/newlib-%{newlib_version}-@newlib_patch_version@-@Release@)/' \
|
sed -e 's/\(version_string = \"[^\"]*\)/\1 (RTEMS gcc-%{gcc_version}-@gcc_patch_version@\/newlib-%{newlib_version}-@newlib_patch_version@-@Release@)/' \
|
||||||
|
|||||||
@@ -52,20 +52,16 @@ patchn=-1
|
|||||||
if test -n "${gcc3_patch_version}"; then
|
if test -n "${gcc3_patch_version}"; then
|
||||||
patchn=`expr $patchn + 1`
|
patchn=`expr $patchn + 1`
|
||||||
PATCH1="Patch${patchn}: gcc-${gcc3_version}-rtems-${gcc3_patch_version}.diff"
|
PATCH1="Patch${patchn}: gcc-${gcc3_version}-rtems-${gcc3_patch_version}.diff"
|
||||||
PATCH2="%patch${patchn} -p0"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test -n "${gcc3newlib_patch_version}"; then
|
if test -n "${gcc3newlib_patch_version}"; then
|
||||||
patchn=`expr $patchn + 1`
|
patchn=`expr $patchn + 1`
|
||||||
PATCH3="Patch${patchn}: newlib-${gcc3newlib_version}-rtems-${gcc3newlib_patch_version}.diff"
|
PATCH3="Patch${patchn}: newlib-${gcc3newlib_version}-rtems-${gcc3newlib_patch_version}.diff"
|
||||||
PATCH4="%patch${patchn} -p0"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# note that the variables in the gcc3newlib directory are actually the same
|
# note that the variables in the gcc3newlib directory are actually the same
|
||||||
sed -e "s,@PATCH1\@,${PATCH1}," \
|
sed -e "s,@PATCH1\@,${PATCH1}," \
|
||||||
-e "s,@PATCH2\@,${PATCH2}," \
|
|
||||||
-e "s,@PATCH3\@,${PATCH3}," \
|
-e "s,@PATCH3\@,${PATCH3}," \
|
||||||
-e "s,@PATCH4\@,${PATCH4}," \
|
|
||||||
-e "s%@Release\@%${gcc3newlib_rpm_release}%g" \
|
-e "s%@Release\@%${gcc3newlib_rpm_release}%g" \
|
||||||
-e "s%@target_alias\@%${target_alias}%g" \
|
-e "s%@target_alias\@%${target_alias}%g" \
|
||||||
-e "s%@prefix\@%@prefix@%g" \
|
-e "s%@prefix\@%@prefix@%g" \
|
||||||
|
|||||||
Reference in New Issue
Block a user