diff options
Diffstat (limited to 'rtems')
40 files changed, 81 insertions, 309 deletions
diff --git a/rtems/config/4.10/rtems-bfin.bset b/rtems/config/4.10/rtems-bfin.bset index 4024292..24887d1 100644 --- a/rtems/config/4.10/rtems-bfin.bset +++ b/rtems/config/4.10/rtems-bfin.bset @@ -20,7 +20,7 @@ # # GDB simulator fix for the sed command. # -%define rtems_gdb_patch2 %{rtems_gdb_patches}/bfin/gdb-7.3.1-bfin-sim-fix-sed-20130319.diff +%patch add gdb %{rtems_gdb_patches}/bfin/gdb-7.3.1-bfin-sim-fix-sed-20130319.diff # # Tools configuration. diff --git a/rtems/config/4.11/rtems-lm32.bset b/rtems/config/4.11/rtems-lm32.bset index a6d5622..da79cd4 100644 --- a/rtems/config/4.11/rtems-lm32.bset +++ b/rtems/config/4.11/rtems-lm32.bset @@ -20,7 +20,7 @@ # # Fix the simulator UART interface. # -%define rtems_gdb_patch3 %{rtems_gdb_patches}/lm32/gdb-sim-lm32uart.diff +%patch add gdb %{rtems_gdb_patches}/lm32/gdb-sim-lm32uart.diff # # Tools configuration. diff --git a/rtems/config/4.11/rtems-microblaze.bset b/rtems/config/4.11/rtems-microblaze.bset index 067e272..97b2638 100644 --- a/rtems/config/4.11/rtems-microblaze.bset +++ b/rtems/config/4.11/rtems-microblaze.bset @@ -20,12 +20,12 @@ # # GCC 4.7.2 Microblaze Patch # -%define rtems_gcc_patch2 %{rtems_gcc_patches}/microblaze/gcc-4.7.2-microblaze-ldscript-2.diff +%patch add gcc %{rtems_gcc_patches}/microblaze/gcc-4.7.2-microblaze-ldscript-2.diff # # GCC 4.8.2 Microblaze Patch for libgcc. # -%define rtems_gcc_patch3 %{rtems_gcc_patches}/microblaze/rtems-gcc-microblaze-libgcc-20131017.diff +%patch add gcc %{rtems_gcc_patches}/microblaze/rtems-gcc-microblaze-libgcc-20131017.diff # # Tools configuration. diff --git a/rtems/config/4.11/rtems-sparc.bset b/rtems/config/4.11/rtems-sparc.bset index f80d402..d4c842c 100644 --- a/rtems/config/4.11/rtems-sparc.bset +++ b/rtems/config/4.11/rtems-sparc.bset @@ -20,7 +20,7 @@ # # GDB patche # -%define rtems_gdb_patch1 %{rtems_gdb_patches}/sparc/gdb-7.6.2-sis-output-nouartrx.diff +%patch add gdb %{rtems_gdb_patches}/sparc/gdb-7.6.2-sis-output-nouartrx.diff # # Tools configuration. diff --git a/rtems/config/4.11/rtems-v850.bset b/rtems/config/4.11/rtems-v850.bset index 8e3abab..1d0ac6c 100644 --- a/rtems/config/4.11/rtems-v850.bset +++ b/rtems/config/4.11/rtems-v850.bset @@ -20,7 +20,7 @@ # # GCC 4.8 V850 Patch # -%define rtems_gcc_patch3 %{rtems_gcc_patches}/v850/gcc-4.8.2-rtems4.11-20140349.diff +%patch add gcc %{rtems_gcc_patches}/v850/gcc-4.8.2-rtems4.11-20140349.diff # # Tools configuration. diff --git a/rtems/config/rtems-binutils-patches.cfg b/rtems/config/rtems-binutils-patches.cfg deleted file mode 100644 index b9d85c2..0000000 --- a/rtems/config/rtems-binutils-patches.cfg +++ /dev/null @@ -1,27 +0,0 @@ -# -# Manage RTEMS Binutils specific patches in the build sets -# -%if %{defined rtems_binutils_patch1} - Patch1: %{rtems_binutils_patch1} -%endif -%if %{defined rtems_binutils_patch2} - Patch2: %{rtems_binutils_patch2} -%endif -%if %{defined rtems_binutils_patch3} - Patch3: %{rtems_binutils_patch3} -%endif -%if %{defined rtems_binutils_patch4} - Patch4: %{rtems_binutils_patch4} -%endif -%if %{defined rtems_binutils_patch11} - Patch11: %{rtems_binutils_patch11} -%endif -%if %{defined rtems_binutils_patch12} - Patch12: %{rtems_binutils_patch12} -%endif -%if %{defined rtems_binutils_patch13} - Patch13: %{rtems_binutils_patch13} -%endif -%if %{defined rtems_binutils_patch14} - Patch14: %{rtems_binutils_patch14} -%endif diff --git a/rtems/config/rtems-gcc-patches.cfg b/rtems/config/rtems-gcc-patches.cfg deleted file mode 100644 index 82568c9..0000000 --- a/rtems/config/rtems-gcc-patches.cfg +++ /dev/null @@ -1,51 +0,0 @@ -# -# Manage RTEMS GCC/Newlib specific patches in the build sets -# -%if %{defined rtems_gcc_patch1} - Patch1: %{rtems_gcc_patch1} - %if %{defined rtems_gcc_patch1_opts} - %define patch1_opts %{rtems_gcc_patch1_opts} - %endif -%endif -%if %{defined rtems_gcc_patch2} - Patch2: %{rtems_gcc_patch2} - %if %{defined rtems_gcc_patch2_opts} - %define patch2_opts %{rtems_gcc_patch2_opts} - %endif -%endif -%if %{defined rtems_gcc_patch3} - Patch3: %{rtems_gcc_patch3} - %if %{defined rtems_gcc_patch3_opts} - %define patch3_opts %{rtems_gcc_patch3_opts} - %endif -%endif -%if %{defined rtems_gcc_patch4} - Patch4: %{rtems_gcc_patch4} - %if %{defined rtems_gcc_patch4_opts} - %define patch4_opts %{rtems_gcc_patch4_opts} - %endif -%endif -%if %{defined rtems_gcc_patch11} - Patch11: %{rtems_gcc_patch11} - %if %{defined rtems_gcc_patch11_opts} - %define patch11_opts %{rtems_gcc_patch11_opts} - %endif -%endif -%if %{defined rtems_gcc_patch12} - Patch12: %{rtems_gcc_patch12} - %if %{defined rtems_gcc_patch12_opts} - %define patch12_opts %{rtems_gcc_patch12_opts} - %endif -%endif -%if %{defined rtems_gcc_patch13} - Patch13: %{rtems_gcc_patch13} - %if %{defined rtems_gcc_patch13_opts} - %define patch13_opts %{rtems_gcc_patch13_opts} - %endif -%endif -%if %{defined rtems_gcc_patch14} - Patch14: %{rtems_gcc_patch14} - %if %{defined rtems_gcc_patch14_opts} - %define patch14_opts %{rtems_gcc_patch14_opts} - %endif -%endif diff --git a/rtems/config/rtems-gdb-patches.cfg b/rtems/config/rtems-gdb-patches.cfg deleted file mode 100644 index e6a72d8..0000000 --- a/rtems/config/rtems-gdb-patches.cfg +++ /dev/null @@ -1,27 +0,0 @@ -# -# Manage RTEMS GDB specific patches in the build sets -# -%if %{defined rtems_gdb_patch1} - Patch1: %{rtems_gdb_patch1} -%endif -%if %{defined rtems_gdb_patch2} - Patch2: %{rtems_gdb_patch2} -%endif -%if %{defined rtems_gdb_patch3} - Patch3: %{rtems_gdb_patch3} -%endif -%if %{defined rtems_gdb_patch4} - Patch4: %{rtems_gdb_patch4} -%endif -%if %{defined rtems_gdb_patch11} - Patch11: %{rtems_gdb_patch11} -%endif -%if %{defined rtems_gdb_patch12} - Patch12: %{rtems_gdb_patch12} -%endif -%if %{defined rtems_gdb_patch13} - Patch13: %{rtems_gdb_patch13} -%endif -%if %{defined rtems_gdb_patch14} - Patch14: %{rtems_gdb_patch14} -%endif diff --git a/rtems/config/tools/rtems-binutils-2.20.1-1.cfg b/rtems/config/tools/rtems-binutils-2.20.1-1.cfg index 172d2b2..b721a10 100644 --- a/rtems/config/tools/rtems-binutils-2.20.1-1.cfg +++ b/rtems/config/tools/rtems-binutils-2.20.1-1.cfg @@ -7,17 +7,12 @@ %define binutils_version 2.20.1 -Patch0: %{rtems_binutils_patches}/binutils-2.20.1-rtems4.10-20100826.diff +%patch add binutils %{rtems_binutils_patches}/binutils-2.20.1-rtems4.10-20100826.diff %ifos win32 mingw ming32 cygwin - Patch1: %{rtems_binutils_patches}/cygwin/binutils-2.20.1-cygwin-w64-20130324.diff + %patch add binutils %{rtems_binutils_patches}/cygwin/binutils-2.20.1-cygwin-w64-20130324.diff %endif # -# RTEMS Build Set patches. -# -%include rtems-binutils-patches.cfg - -# # The binutils build instructions. We use 2.xx Release 1. # %include %{_configdir}/binutils-2-1.cfg diff --git a/rtems/config/tools/rtems-binutils-2.22-1.cfg b/rtems/config/tools/rtems-binutils-2.22-1.cfg index aaeaf3e..664f5d9 100644 --- a/rtems/config/tools/rtems-binutils-2.22-1.cfg +++ b/rtems/config/tools/rtems-binutils-2.22-1.cfg @@ -7,8 +7,7 @@ %define binutils_version 2.22 -Patch0: %{rtems_binutils_patches}/binutils-2.22-rtems4.11-20120427.diff -%include rtems-binutils-patches.cfg +%patch add binutils %{rtems_binutils_patches}/binutils-2.22-rtems4.11-20120427.diff # # The binutils build instructions. We use 2.xx Release 1. diff --git a/rtems/config/tools/rtems-binutils-2.23.1-1.cfg b/rtems/config/tools/rtems-binutils-2.23.1-1.cfg index cfa904c..4f39a6b 100644 --- a/rtems/config/tools/rtems-binutils-2.23.1-1.cfg +++ b/rtems/config/tools/rtems-binutils-2.23.1-1.cfg @@ -15,11 +15,6 @@ %define with_deterministic_archives 1 # -# Include the RTEMS specific patches -# -%include rtems-binutils-patches.cfg - -# # The binutils build instructions. We use 2.xx Release 1. # %include %{_configdir}/binutils-2-1.cfg diff --git a/rtems/config/tools/rtems-binutils-2.23.2-1.cfg b/rtems/config/tools/rtems-binutils-2.23.2-1.cfg index f1b5079..d4f2c4b 100644 --- a/rtems/config/tools/rtems-binutils-2.23.2-1.cfg +++ b/rtems/config/tools/rtems-binutils-2.23.2-1.cfg @@ -15,11 +15,6 @@ %define with_deterministic_archives 1 # -# Include the RTEMS specific patches -# -%include rtems-binutils-patches.cfg - -# # The binutils build instructions. We use 2.xx Release 1. # %include %{_configdir}/binutils-2-1.cfg diff --git a/rtems/config/tools/rtems-binutils-2.24-1.cfg b/rtems/config/tools/rtems-binutils-2.24-1.cfg index 847680a..60cd982 100644 --- a/rtems/config/tools/rtems-binutils-2.24-1.cfg +++ b/rtems/config/tools/rtems-binutils-2.24-1.cfg @@ -15,11 +15,6 @@ %define with_deterministic_archives 1 # -# Include the RTEMS specific patches -# -%include rtems-binutils-patches.cfg - -# # The binutils build instructions. We use 2.xx Release 1. # %include %{_configdir}/binutils-2-1.cfg diff --git a/rtems/config/tools/rtems-gcc-4.3.2-newlib-1.16.0-1.cfg b/rtems/config/tools/rtems-gcc-4.3.2-newlib-1.16.0-1.cfg index f115447..12a8003 100644 --- a/rtems/config/tools/rtems-gcc-4.3.2-newlib-1.16.0-1.cfg +++ b/rtems/config/tools/rtems-gcc-4.3.2-newlib-1.16.0-1.cfg @@ -18,15 +18,10 @@ # # The RTEMS 4.9 patches # -Source0: ftp://ftp.gnu.org/pub/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_version}.tar.bz2 -Patch0: %{rtems_gcc_patches}/gcc-core-4.3.2-rtems4.9-20090825.diff -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/gcc-%{gcc_version}/gcc-g++-%{gcc_version}.tar.bz2 -Patch10: %{rtems_newlib_patches}/newlib-1.16.0-rtems4.9-20090324.diff - -# -# Generic RTEMS patch handling. -# -%include rtems-gcc-patches.cfg +%source set gcc ftp://ftp.gnu.org/pub/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_version}.tar.bz2 +%patch add gcc %{rtems_gcc_patches}/gcc-core-4.3.2-rtems4.9-20090825.diff +%source add gcc ftp://ftp.gnu.org/pub/gnu/gcc/gcc-%{gcc_version}/gcc-g++-%{gcc_version}.tar.bz2 +%patch add gcc %{rtems_newlib_patches}/newlib-1.16.0-rtems4.9-20090324.diff # # The gcc/newlib build instructions. We use 4.7 Release 1. diff --git a/rtems/config/tools/rtems-gcc-4.4.7-newlib-1.18.0-1.cfg b/rtems/config/tools/rtems-gcc-4.4.7-newlib-1.18.0-1.cfg index 6035486..d240aa7 100644 --- a/rtems/config/tools/rtems-gcc-4.4.7-newlib-1.18.0-1.cfg +++ b/rtems/config/tools/rtems-gcc-4.4.7-newlib-1.18.0-1.cfg @@ -26,12 +26,11 @@ # # The RTEMS 4.10 patches # -Patch0: %{rtems_gcc_patches}/gcc-core-4.4.7-rtems4.10-20120314.diff +%patch add gcc %{rtems_gcc_patches}/gcc-core-4.4.7-rtems4.10-20120314.diff %if %{enable_cxx} -Patch1: %{rtems_gcc_patches}/gcc-g++-4.4.7-rtems4.10-20120314.diff + %patch add gcc %{rtems_gcc_patches}/gcc-g++-4.4.7-rtems4.10-20120314.diff %endif -Patch10: %{rtems_newlib_patches}/newlib-1.18.0-rtems4.10-20110518.diff -%include rtems-gcc-patches.cfg +%patch add newlib %{rtems_newlib_patches}/newlib-1.18.0-rtems4.10-20110518.diff # # The gcc/newlib build instructions. We use 4.4 Release 1. diff --git a/rtems/config/tools/rtems-gcc-4.5.3-newlib-2.0.0-1.cfg b/rtems/config/tools/rtems-gcc-4.5.3-newlib-2.0.0-1.cfg index 41c0fe1..0f5d225 100644 --- a/rtems/config/tools/rtems-gcc-4.5.3-newlib-2.0.0-1.cfg +++ b/rtems/config/tools/rtems-gcc-4.5.3-newlib-2.0.0-1.cfg @@ -18,8 +18,7 @@ # # Libiberty strsignal fix # -Patch0: %{rtems_gcc_patches}/gcc-4.5.3-strsignal-1.diff -%include rtems-gcc-patches.cfg +%patch add gcc %{rtems_gcc_patches}/gcc-4.5.3-strsignal-1.diff # # The gcc/newlib build instructions. We use 4.5 Release 1. diff --git a/rtems/config/tools/rtems-gcc-4.5.3-newlib-2.1.0-1.cfg b/rtems/config/tools/rtems-gcc-4.5.3-newlib-2.1.0-1.cfg index aad4679..668e356 100644 --- a/rtems/config/tools/rtems-gcc-4.5.3-newlib-2.1.0-1.cfg +++ b/rtems/config/tools/rtems-gcc-4.5.3-newlib-2.1.0-1.cfg @@ -18,8 +18,7 @@ # # Libiberty strsignal fix # -Patch0: %{rtems_gcc_patches}/gcc-4.5.3-strsignal-1.diff -%include rtems-gcc-patches.cfg +%patch add gcc %{rtems_gcc_patches}/gcc-4.5.3-strsignal-1.diff # # The gcc/newlib build instructions. We use 4.5 Release 1. diff --git a/rtems/config/tools/rtems-gcc-4.6.3-newlib-1.20.0-1.cfg b/rtems/config/tools/rtems-gcc-4.6.3-newlib-1.20.0-1.cfg index 8a73626..9d63a92 100644 --- a/rtems/config/tools/rtems-gcc-4.6.3-newlib-1.20.0-1.cfg +++ b/rtems/config/tools/rtems-gcc-4.6.3-newlib-1.20.0-1.cfg @@ -34,8 +34,8 @@ # # The RTEMS 4.11 patches # -Patch0: gcc-core-4.6.3-rtems4.11-20120303.diff -Patch10: newlib-1.20.0-rtems4.11-20121011.diff +%patch add gcc gcc-core-4.6.3-rtems4.11-20120303.diff +%patch add newlib newlib-1.20.0-rtems4.11-20121011.diff # # The gcc/newlib build instructions. We use 4.4 Release 1. diff --git a/rtems/config/tools/rtems-gcc-4.7.2-newlib-1.20.0-1.cfg b/rtems/config/tools/rtems-gcc-4.7.2-newlib-1.20.0-1.cfg index 18bb1b7..167d7c5 100644 --- a/rtems/config/tools/rtems-gcc-4.7.2-newlib-1.20.0-1.cfg +++ b/rtems/config/tools/rtems-gcc-4.7.2-newlib-1.20.0-1.cfg @@ -43,9 +43,8 @@ # # The RTEMS 4.11 patches # -Patch0: %{rtems_gcc_patches}/gcc-4.7.2-rtems4.11-20121026.diff -Patch10: %{rtems_newlib_patches}/newlib-1.20.0-rtems4.11-20121011.diff -%include rtems-gcc-patches.cfg +%patch add gcc %{rtems_gcc_patches}/gcc-4.7.2-rtems4.11-20121026.diff +%patch add newlib %{rtems_newlib_patches}/newlib-1.20.0-rtems4.11-20121011.diff # # The gcc/newlib build instructions. We use 4.7 Release 1. diff --git a/rtems/config/tools/rtems-gcc-4.7.2-newlib-2.0.0-1.cfg b/rtems/config/tools/rtems-gcc-4.7.2-newlib-2.0.0-1.cfg index 5d1d3d4..8914815 100644 --- a/rtems/config/tools/rtems-gcc-4.7.2-newlib-2.0.0-1.cfg +++ b/rtems/config/tools/rtems-gcc-4.7.2-newlib-2.0.0-1.cfg @@ -19,8 +19,7 @@ # # The RTEMS 4.11 patches # -Patch0: %{rtems_gcc_patches}/gcc-4.7.2-rtems4.11-20121026.diff -%include rtems-gcc-patches.cfg +%patch add gcc %{rtems_gcc_patches}/gcc-4.7.2-rtems4.11-20121026.diff # Incompatible with Texinfo 5 %if %{__makeinfo_ver} >= 5.0 diff --git a/rtems/config/tools/rtems-gcc-4.7.3-newlib-2.0.0-1.cfg b/rtems/config/tools/rtems-gcc-4.7.3-newlib-2.0.0-1.cfg index 37f123a..518e28b 100644 --- a/rtems/config/tools/rtems-gcc-4.7.3-newlib-2.0.0-1.cfg +++ b/rtems/config/tools/rtems-gcc-4.7.3-newlib-2.0.0-1.cfg @@ -19,8 +19,7 @@ # # The RTEMS 4.11 patches # -Patch0: %{rtems_gcc_patches}/gcc-4.7.3-rtems4.11-20130414.diff -%include rtems-gcc-patches.cfg +%patch add gcc %{rtems_gcc_patches}/gcc-4.7.3-rtems4.11-20130414.diff # Incompatible with Texinfo 5 %if %{__makeinfo_ver} >= 5.0 diff --git a/rtems/config/tools/rtems-gcc-4.8-ss-newlib-2.0.0-1.cfg b/rtems/config/tools/rtems-gcc-4.8-ss-newlib-2.0.0-1.cfg index 082fb66..0fd1641 100644 --- a/rtems/config/tools/rtems-gcc-4.8-ss-newlib-2.0.0-1.cfg +++ b/rtems/config/tools/rtems-gcc-4.8-ss-newlib-2.0.0-1.cfg @@ -18,7 +18,7 @@ # # The RTEMS 4.11 patches # -Source0: ftp://gcc.gnu.org/pub/gcc/snapshots/%{gcc_version}/gcc-%{gcc_version}.tar.bz2 +%source set gcc ftp://gcc.gnu.org/pub/gcc/snapshots/%{gcc_version}/gcc-%{gcc_version}.tar.bz2 # # The gcc/newlib build instructions. We use 4.7 Release 1. diff --git a/rtems/config/tools/rtems-gcc-4.8.0-newlib-cvs-1.cfg b/rtems/config/tools/rtems-gcc-4.8.0-newlib-cvs-1.cfg index a243409..7c545fd 100644 --- a/rtems/config/tools/rtems-gcc-4.8.0-newlib-cvs-1.cfg +++ b/rtems/config/tools/rtems-gcc-4.8.0-newlib-cvs-1.cfg @@ -24,20 +24,14 @@ # # Newlib is from CVS. # -Source10: cvs://pserver:anoncvs@sourceware.org/cvs/src?module=newlib?src-prefix=src?date=%{newlib_version}?reset +%source set newlib cvs://pserver:anoncvs@sourceware.org/cvs/src?module=newlib?src-prefix=src?date=%{newlib_version}?reset # # Joel's stack_t patch. # -%define rtems_gcc_patch11 %{rtems_newlib_patches}/newlib-sys-signal-20130532.diff -%define rtems_gcc_patch11_opts -p0 +%patch add newlib -p0 %{rtems_newlib_patches}/newlib-sys-signal-20130532.diff # -# -# Manage RTEMS patches -# -%include rtems-gcc-patches.cfg - # The gcc/newlib build instructions. We use 4.8 Release 1. # %include %{_configdir}/gcc-4.8-1.cfg diff --git a/rtems/config/tools/rtems-gcc-4.8.1-newlib-cvs-1.cfg b/rtems/config/tools/rtems-gcc-4.8.1-newlib-cvs-1.cfg index d1cca38..32c6547 100644 --- a/rtems/config/tools/rtems-gcc-4.8.1-newlib-cvs-1.cfg +++ b/rtems/config/tools/rtems-gcc-4.8.1-newlib-cvs-1.cfg @@ -27,30 +27,24 @@ # # Newlib is from CVS. # -Source10: cvs://pserver:anoncvs@sourceware.org/cvs/src?module=newlib?src-prefix=src?date=%{newlib_version}?reset +%source set newlib cvs://pserver:anoncvs@sourceware.org/cvs/src?module=newlib?src-prefix=src?date=%{newlib_version}?reset # # Sebastian's atexit patch. # -%define rtems_gcc_patch1 %{rtems_gcc_patches}/gcc-4.8.1-rtems4.11-20130709.diff +%patch add gcc %{rtems_gcc_patches}/gcc-4.8.1-rtems4.11-20130709.diff # # Chris's patch to use the POSIX thread model for C++. # -%define rtems_gcc_patch2 %{rtems_gcc_patches}/gcc-rtems-thread-model-posix-1.diff +%patch add gcc %{rtems_gcc_patches}/gcc-rtems-thread-model-posix-1.diff # # Joel's stack_t patch. # -%define rtems_gcc_patch11 %{rtems_newlib_patches}/newlib-sys-signal-20130532.diff -%define rtems_gcc_patch11_opts -p0 +%patch add newlib -p0 %{rtems_newlib_patches}/newlib-sys-signal-20130532.diff # -# -# Manage RTEMS patches -# -%include rtems-gcc-patches.cfg - # The gcc/newlib build instructions. We use 4.8 Release 1. # %include %{_configdir}/gcc-4.8-1.cfg diff --git a/rtems/config/tools/rtems-gcc-4.8.2-newlib-2.1.0-1.cfg b/rtems/config/tools/rtems-gcc-4.8.2-newlib-2.1.0-1.cfg index 20cf7aa..33821a9 100644 --- a/rtems/config/tools/rtems-gcc-4.8.2-newlib-2.1.0-1.cfg +++ b/rtems/config/tools/rtems-gcc-4.8.2-newlib-2.1.0-1.cfg @@ -1,5 +1,5 @@ # -# GCC 4.8.2., Newlib CVS +# GCC 4.8.2., Newlib 2.1.0 # %include %{_configdir}/checks.cfg @@ -22,14 +22,7 @@ # # Joel's stack_t patch. # -%define rtems_gcc_patch11 %{rtems_newlib_patches}/newlib-sys-signal-20130532.diff -%define rtems_gcc_patch11_opts -p0 - -# -# -# Manage RTEMS patches -# -%include rtems-gcc-patches.cfg +%patch add newlib -p0 %{rtems_newlib_patches}/newlib-sys-signal-20130532.diff # The gcc/newlib build instructions. We use 4.8 Release 1. # diff --git a/rtems/config/tools/rtems-gcc-4.8.2-newlib-cvs-1.cfg b/rtems/config/tools/rtems-gcc-4.8.2-newlib-cvs-1.cfg index 4a5b642..ca62545 100644 --- a/rtems/config/tools/rtems-gcc-4.8.2-newlib-cvs-1.cfg +++ b/rtems/config/tools/rtems-gcc-4.8.2-newlib-cvs-1.cfg @@ -22,25 +22,19 @@ # # Newlib is from CVS. # -Source10: cvs://pserver:anoncvs@sourceware.org/cvs/src?module=newlib?src-prefix=src?date=%{newlib_version}?reset +%source set newlib cvs://pserver:anoncvs@sourceware.org/cvs/src?module=newlib?src-prefix=src?date=%{newlib_version}?reset # # Chris's patch to use the POSIX thread model for C++. # -%define rtems_gcc_patch2 %{rtems_gcc_patches}/gcc-rtems-thread-model-posix-1.diff +%patch add gcc %{rtems_gcc_patches}/gcc-rtems-thread-model-posix-1.diff # # Joel's stack_t patch. # -%define rtems_gcc_patch11 %{rtems_newlib_patches}/newlib-sys-signal-20130532.diff -%define rtems_gcc_patch11_opts -p0 +%patch add newlib -p0 %{rtems_newlib_patches}/newlib-sys-signal-20130532.diff # -# -# Manage RTEMS patches -# -%include rtems-gcc-patches.cfg - # The gcc/newlib build instructions. We use 4.8 Release 1. # %include %{_configdir}/gcc-4.8-1.cfg diff --git a/rtems/config/tools/rtems-gcc-4.9.0-newlib-2.1.0-1.cfg b/rtems/config/tools/rtems-gcc-4.9.0-newlib-2.1.0-1.cfg index 00b426e..3d99702 100644 --- a/rtems/config/tools/rtems-gcc-4.9.0-newlib-2.1.0-1.cfg +++ b/rtems/config/tools/rtems-gcc-4.9.0-newlib-2.1.0-1.cfg @@ -22,14 +22,7 @@ # # Joel's stack_t patch. # -%define rtems_gcc_patch11 %{rtems_newlib_patches}/newlib-sys-signal-20130532.diff -%define rtems_gcc_patch11_opts -p0 - -# -# -# Manage RTEMS patches -# -%include rtems-gcc-patches.cfg +%patch add newlib -p0 %{rtems_newlib_patches}/newlib-sys-signal-20130532.diff # # The gcc/newlib build instructions. We use 4.9 Release 1. diff --git a/rtems/config/tools/rtems-gdb-6.8-1.cfg b/rtems/config/tools/rtems-gdb-6.8-1.cfg index 49953b7..9159352 100644 --- a/rtems/config/tools/rtems-gdb-6.8-1.cfg +++ b/rtems/config/tools/rtems-gdb-6.8-1.cfg @@ -10,10 +10,8 @@ # # RTEMS Build Set patches. # -Source0: http://ftp.gnu.org/gnu/gdb/gdb-6.8a.tar.bz2 -Patch0: %{rtems_gdb_patches}/gdb-6.8-rtems4.9-20091111.diff - -%include rtems-gdb-patches.cfg +%source set gdb http://ftp.gnu.org/gnu/gdb/gdb-6.8a.tar.bz2 +%patch add gdb %{rtems_gdb_patches}/gdb-6.8-rtems4.9-20091111.diff # # The gdb build instructions. We use 6.xx Release 1. diff --git a/rtems/config/tools/rtems-gdb-7.3.1-1.cfg b/rtems/config/tools/rtems-gdb-7.3.1-1.cfg index 5061dde..874abfd 100644 --- a/rtems/config/tools/rtems-gdb-7.3.1-1.cfg +++ b/rtems/config/tools/rtems-gdb-7.3.1-1.cfg @@ -7,12 +7,7 @@ %define gdb_version 7.3.1 -Patch0: %{rtems_gdb_patches}/gdb-7.3.1-rtems4.10-20120918.diff - -# -# RTEMS Build Set patches. -# -%include rtems-gdb-patches.cfg +%patch add gdb %{rtems_gdb_patches}/gdb-7.3.1-rtems4.10-20120918.diff # # The gdb build instructions. We use 7.xx Release 1. diff --git a/rtems/config/tools/rtems-gdb-7.5-1.cfg b/rtems/config/tools/rtems-gdb-7.5-1.cfg index 5a76c9b..7853d40 100644 --- a/rtems/config/tools/rtems-gdb-7.5-1.cfg +++ b/rtems/config/tools/rtems-gdb-7.5-1.cfg @@ -7,8 +7,7 @@ %define gdb_version 7.5 -Patch0: %{rtems_gdb_patches}/gdb-7.5-rtems4.11-20121003.diff -%include rtems-gdb-patches.cfg +%patch add gdb %{rtems_gdb_patches}/gdb-7.5-rtems4.11-20121003.diff # # The gdb build instructions. We use 7.xx Release 1. diff --git a/rtems/config/tools/rtems-gdb-7.5.1-1.cfg b/rtems/config/tools/rtems-gdb-7.5.1-1.cfg index fee1f03..7cebe17 100644 --- a/rtems/config/tools/rtems-gdb-7.5.1-1.cfg +++ b/rtems/config/tools/rtems-gdb-7.5.1-1.cfg @@ -8,11 +8,6 @@ %define gdb_version 7.5.1 # -# RTEMS Build Set patches. -# -%include rtems-gdb-patches.cfg - -# # The gdb build instructions. We use 7.xx Release 1. # %include %{_configdir}/gdb-7-1.cfg diff --git a/rtems/config/tools/rtems-gdb-7.6-1.cfg b/rtems/config/tools/rtems-gdb-7.6-1.cfg index 3a8d0fd..9d359e6 100644 --- a/rtems/config/tools/rtems-gdb-7.6-1.cfg +++ b/rtems/config/tools/rtems-gdb-7.6-1.cfg @@ -8,11 +8,6 @@ %define gdb_version 7.6 # -# RTEMS Build Set patches. -# -%include rtems-gdb-patches.cfg - -# # The gdb build instructions. We use 7.xx Release 1. # %include %{_configdir}/gdb-7-1.cfg diff --git a/rtems/config/tools/rtems-gdb-7.6.1-1.cfg b/rtems/config/tools/rtems-gdb-7.6.1-1.cfg index 12ea57d..4841256 100644 --- a/rtems/config/tools/rtems-gdb-7.6.1-1.cfg +++ b/rtems/config/tools/rtems-gdb-7.6.1-1.cfg @@ -8,11 +8,6 @@ %define gdb_version 7.6.1 # -# RTEMS Build Set patches. -# -%include rtems-gdb-patches.cfg - -# # The gdb build instructions. We use 7.xx Release 1. # %include %{_configdir}/gdb-7-1.cfg diff --git a/rtems/config/tools/rtems-gdb-7.6.2-1.cfg b/rtems/config/tools/rtems-gdb-7.6.2-1.cfg index 9d26643..523e55f 100644 --- a/rtems/config/tools/rtems-gdb-7.6.2-1.cfg +++ b/rtems/config/tools/rtems-gdb-7.6.2-1.cfg @@ -7,14 +7,8 @@ %define gdb_version 7.6.2 -# -# RTEMS Build Set patches. -# -%include rtems-gdb-patches.cfg - %if %{_build_os} == freebsd -%define patch5 %{rtems_gdb_patches}/patch-gdb-python-python-config.py -%define patch5_opts -p0 + %patch add gdb -p0 %{rtems_gdb_patches}/patch-gdb-python-python-config.py %endif # diff --git a/rtems/config/tools/rtems-gdb-7.7-1.cfg b/rtems/config/tools/rtems-gdb-7.7-1.cfg index d1f59cc..3a89680 100644 --- a/rtems/config/tools/rtems-gdb-7.7-1.cfg +++ b/rtems/config/tools/rtems-gdb-7.7-1.cfg @@ -8,19 +8,13 @@ %define gdb_version 7.7 # -# RTEMS Build Set patches. -# -%include rtems-gdb-patches.cfg - -# # Clean up the sim-arange inline code so it builds. # -%define patch1 %{rtems_gdb_patches}/gdb-sim-arange-inline.diff -%define patch2 %{rtems_gdb_patches}/gdb-sim-cgen-inline.diff +%patch add gdb %{rtems_gdb_patches}/gdb-sim-arange-inline.diff +%patch add gdb %{rtems_gdb_patches}/gdb-sim-cgen-inline.diff %if %{_build_os} == freebsd -%define patch5 %{rtems_gdb_patches}/patch-gdb-python-python-config.py -%define patch5_opts -p0 + %patch add gdb -p0 %{rtems_gdb_patches}/patch-gdb-python-python-config.py %endif # diff --git a/rtems/config/tools/rtems-kernel-4-1.cfg b/rtems/config/tools/rtems-kernel-4-1.cfg index d22f9c2..1bd0c3e 100644 --- a/rtems/config/tools/rtems-kernel-4-1.cfg +++ b/rtems/config/tools/rtems-kernel-4-1.cfg @@ -16,9 +16,7 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n) # # Source # -%ifn %{defined Source0} - Source0: http://ftp.rtems.org/ftp/pub/rtems/%{rtems_kernel_version}/rtems-%{rtems_kernel_version}.tar.bz2 -%endif +%source set rtems http://ftp.rtems.org/ftp/pub/rtems/%{rtems_kernel_version}/rtems-%{rtems_kernel_version}.tar.bz2 # # If C++ defined for the tool set use it to control RTEMS's setting.. @@ -60,19 +58,10 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n) # Prepare the source code. # %prep - source_dir_0="rtems-%{rtems_kernel_version}" - %setup -q -c -n %{name}-%{version} - cd ${source_dir_0} - %{?patch0:%patch0 %{?patch0_opts:%{patch0_opts}}%{!?patch0_opts:-p1}} - %{?patch1:%patch1 %{?patch1_opts:%{patch1_opts}}%{!?patch1_opts:-p1}} - %{?patch2:%patch2 %{?patch2_opts:%{patch2_opts}}%{!?patch2_opts:-p1}} - %{?patch3:%patch3 %{?patch3_opts:%{patch3_opts}}%{!?patch3_opts:-p1}} - %{?patch4:%patch4 %{?patch4_opts:%{patch4_opts}}%{!?patch4_opts:-p1}} - %{?patch5:%patch5 %{?patch5_opts:%{patch5_opts}}%{!?patch5_opts:-p1}} - %{?patch6:%patch6 %{?patch6_opts:%{patch6_opts}}%{!?patch6_opts:-p1}} - %{?patch7:%patch7 %{?patch7_opts:%{patch7_opts}}%{!?patch7_opts:-p1}} - %{?patch8:%patch8 %{?patch8_opts:%{patch8_opts}}%{!?patch8_opts:-p1}} - %{?patch9:%patch9 %{?patch9_opts:%{patch9_opts}}%{!?patch9_opts:-p1}} + source_dir_rtems="rtems-%{rtems_kernel_version}" + %source setup rtems -q -c -n %{name}-%{version} + cd ${source_dir_rtems} + %patch setup rtems -p1 %if %{rtems_bootstrap} %if %{defined _internal_autotools_path} export PATH="%{_internal_autotools_path}/bin:${PATH}" @@ -93,7 +82,7 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n) mkdir -p ${build_dir} cd ${build_dir} - ../${source_dir_0}/configure \ + ../${source_dir_rtems}/configure \ --build=%{_build} --host=%{_host} \ --target=%{_target} \ %{?rtems_posix:--enable-posix}%{!?rtems_posix:--disable-posix} \ diff --git a/rtems/config/tools/rtems-kernel-4.11.cfg b/rtems/config/tools/rtems-kernel-4.11.cfg index fc5f699..f5bb610 100644 --- a/rtems/config/tools/rtems-kernel-4.11.cfg +++ b/rtems/config/tools/rtems-kernel-4.11.cfg @@ -38,7 +38,7 @@ # Pull the latest changes from git each build. Override if this is not what you # want. # - Source0: git://git.rtems.org/rtems.git?reset=hard?pull + %source set rtems git://git.rtems.org/rtems.git?reset=hard?pull # # The code in git needs to be bootstrapped. Do each build because we have diff --git a/rtems/config/tools/rtems-nios2-binutils-2.20-1.cfg b/rtems/config/tools/rtems-nios2-binutils-2.20-1.cfg index c4be761..4d4a4e6 100644 --- a/rtems/config/tools/rtems-nios2-binutils-2.20-1.cfg +++ b/rtems/config/tools/rtems-nios2-binutils-2.20-1.cfg @@ -15,8 +15,8 @@ # # Source # -Source0: http://ftp.rtems.org/ftp/pub/rtems/people/chrisj/nios/nios2-binutils-2.20.tar.bz2 -Patch0: %{rtems_binutils_patches}/nios2/nios2-binutils-2.20-rtems-20110703.diff +%source set binutils http://ftp.rtems.org/ftp/pub/rtems/people/chrisj/nios/nios2-binutils-2.20.tar.bz2 +%patch add binutils %{rtems_binutils_patches}/nios2/nios2-binutils-2.20-rtems-20110703.diff # # The binutils build instructions. We use 2.xx Release 1. diff --git a/rtems/config/tools/rtems-nios2-gcc-4.1-newlib-1.19.0-1.cfg b/rtems/config/tools/rtems-nios2-gcc-4.1-newlib-1.19.0-1.cfg index cb410da..5a0c467 100644 --- a/rtems/config/tools/rtems-nios2-gcc-4.1-newlib-1.19.0-1.cfg +++ b/rtems/config/tools/rtems-nios2-gcc-4.1-newlib-1.19.0-1.cfg @@ -20,8 +20,8 @@ # # The RTEMS 4.11 patches # -Patch0: %{rtems_gcc_patches}/nios2/nios2-gcc-4.1-rtems-20110818.diff -Patch10: %{rtems_newlib_patches}/nios2/nios2-newlib-1.19.0-rtems-20110720.diff +%patch add gcc %{rtems_gcc_patches}/nios2/nios2-gcc-4.1-rtems-20110818.diff +%patch add newlib %{rtems_newlib_patches}/nios2/nios2-newlib-1.19.0-rtems-20110720.diff Name: %{_target}-gcc-%{gcc_version}-newlib-%{newlib_version}-%{release} Summary: GCC v%{gcc_version} and Newlib v%{newlib_version} for target %{_target} on host %{_host} @@ -41,12 +41,12 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n) # # GCC core and G++ # -Source0: http://ftp.rtems.org/ftp/pub/rtems/people/chrisj/nios/nios2-gcc-4.1.tar.bz2 +%source set gcc http://ftp.rtems.org/ftp/pub/rtems/people/chrisj/nios/nios2-gcc-4.1.tar.bz2 # # Newlib # -Source10: ftp://sourceware.org/pub/newlib/newlib-%{newlib_version}.tar.gz +%source set newlib ftp://sourceware.org/pub/newlib/newlib-%{newlib_version}.tar.gz # # The GCC library directory @@ -57,48 +57,35 @@ Source10: ftp://sourceware.org/pub/newlib/newlib-%{newlib_version}.tar.gz # Prepare the source code. # %prep + # save the build top directory and cd back to it rather than + # using 'cd ..' because some shells change $PWD to a symlink's + # target location and 'cd ..' fails. + build_top=$(pwd) + # gcc - source_dir_0="gcc-%{gcc_version}" - %setup -q -c -n %{name}-%{version} - cd ${source_dir_0} - %{?patch0:%patch0 %{?patch0_opts:%{patch0_opts}}%{!?patch0_opts:-p1}} - %{?patch1:%patch1 %{?patch1_opts:%{patch1_opts}}%{!?patch1_opts:-p1}} - %{?patch2:%patch2 %{?patch2_opts:%{patch2_opts}}%{!?patch2_opts:-p1}} - %{?patch3:%patch3 %{?patch3_opts:%{patch3_opts}}%{!?patch3_opts:-p1}} - %{?patch4:%patch4 %{?patch4_opts:%{patch4_opts}}%{!?patch4_opts:-p1}} - %{?patch5:%patch5 %{?patch5_opts:%{patch5_opts}}%{!?patch5_opts:-p1}} - %{?patch6:%patch6 %{?patch6_opts:%{patch6_opts}}%{!?patch6_opts:-p1}} - %{?patch7:%patch7 %{?patch7_opts:%{patch7_opts}}%{!?patch7_opts:-p1}} - %{?patch8:%patch8 %{?patch8_opts:%{patch8_opts}}%{!?patch8_opts:-p1}} - %{?patch9:%patch9 %{?patch9_opts:%{patch9_opts}}%{!?patch9_opts:-p1}} - cd .. + source_dir_gcc="gcc-%{gcc_version}" + %source setup gcc -q -c -n %{name}-%{version} + cd ${source_dir_gcc} + %patch setup gcc -p1 + cd ${build_top} # newlib - source_dir_10="newlib-%{newlib_version}" - %setup -q -D -T -n %{name}-%{version} -a10 - cd ${source_dir_10} - %{?patch10:%patch10 %{?patch10_opts:%{patch10_opts}}%{!?patch10_opts:-p1}} - %{?patch11:%patch11 %{?patch11_opts:%{patch11_opts}}%{!?patch11_opts:-p1}} - %{?patch12:%patch12 %{?patch12_opts:%{patch12_opts}}%{!?patch12_opts:-p1}} - %{?patch13:%patch13 %{?patch13_opts:%{patch13_opts}}%{!?patch13_opts:-p1}} - %{?patch14:%patch14 %{?patch14_opts:%{patch14_opts}}%{!?patch14_opts:-p1}} - %{?patch15:%patch15 %{?patch15_opts:%{patch15_opts}}%{!?patch15_opts:-p1}} - %{?patch16:%patch16 %{?patch16_opts:%{patch16_opts}}%{!?patch16_opts:-p1}} - %{?patch17:%patch17 %{?patch17_opts:%{patch17_opts}}%{!?patch17_opts:-p1}} - %{?patch18:%patch18 %{?patch18_opts:%{patch18_opts}}%{!?patch18_opts:-p1}} - %{?patch19:%patch19 %{?patch19_opts:%{patch19_opts}}%{!?patch19_opts:-p1}} - cd .. + source_dir_newlib="newlib-%{newlib_version}" + %source setup newlib -q -D -n %{name}-%{version} + cd ${source_dir_newlib} + %patch setup newlib -p1 + cd ${build_top} # Link newlib into the gcc source tree - %{__rmfile} ${source_dir_0}/newlib - %{__ln_s} $PWD/${source_dir_10}/newlib ${source_dir_0}/newlib + %{__rmfile} ${source_dir_gcc}/newlib + %{__ln_s} $PWD/${source_dir_newlib}/newlib ${source_dir_gcc}/newlib echo "%{gcc_version_message}" > gcc-%{gcc_version}/gcc/DEV-PHASE # Fix timestamps - cd ${source_dir_0} + cd ${source_dir_gcc} contrib/gcc_update --touch - cd .. + cd ${build_top} %build %{build_directory} @@ -113,7 +100,7 @@ Source10: ftp://sourceware.org/pub/newlib/newlib-%{newlib_version}.tar.gz %{host_build_flags} - ../${source_dir_0}/configure \ + ../${source_dir_gcc}/configure \ --prefix=%{_prefix} \ --bindir=%{_bindir} \ --exec_prefix=%{_exec_prefix} \ @@ -142,7 +129,7 @@ Source10: ftp://sourceware.org/pub/newlib/newlib-%{newlib_version}.tar.gz # Bug in gcc-3.2.1: # Somehow, gcc doesn't get syslimits.h right for Cdn-Xs mkdir -p gcc/include - cp ../${source_dir_0}/gcc/gsyslimits.h gcc/include/syslimits.h + cp ../${source_dir_gcc}/gcc/gsyslimits.h gcc/include/syslimits.h fi # jobs > 1 is broken with this version of gcc @@ -189,4 +176,4 @@ Source10: ftp://sourceware.org/pub/newlib/newlib-%{newlib_version}.tar.gz %{__rmfile} $SB_BUILD_ROOT%{_mandir}/man3/*ffi* # Clean the symlinks away incase the source is a repo - %{__rmfile} ${source_dir_0}/newlib + %{__rmfile} ${source_dir_gcc}/newlib diff --git a/rtems/config/tools/rtems-nios2-gdb-7.0-1.cfg b/rtems/config/tools/rtems-nios2-gdb-7.0-1.cfg index b255ec0..e61fd71 100644 --- a/rtems/config/tools/rtems-nios2-gdb-7.0-1.cfg +++ b/rtems/config/tools/rtems-nios2-gdb-7.0-1.cfg @@ -11,7 +11,7 @@ %define without_python -Source0: http://ftp.rtems.org/ftp/pub/rtems/people/chrisj/nios/nios2-gdb-7.0.tar.bz2 +%source set gdb http://ftp.rtems.org/ftp/pub/rtems/people/chrisj/nios/nios2-gdb-7.0.tar.bz2 # # The gdb build instructions. We use 7.xx Release 1. |