From: Chris Johns <chr...@rtems.org>
Updates #4715
---
bare/config/devel/binutils-2.22-1.cfg | 2 +
bare/config/devel/binutils-2.24-1.cfg | 2 +
bare/config/devel/gcc-4.6-newlib-1.20-1.cfg | 21 ++++++---
.../config/devel/gcc-4.9.1-newlib-2.1.0-1.cfg | 17 +++++--
bare/config/devel/glib-2.46.2-1.cfg | 9 ++--
bare/config/devel/or1ksim-1.1.0.cfg | 3 +-
bare/config/devel/qemu4-git-1.cfg | 3 +-
rtems/config/graphics/libjpeg-9a-1.cfg | 3 +-
source-builder/config/freetype-1.cfg | 6 ++-
source-builder/config/gcc-4.9-1.cfg | 19 ++++----
source-builder/config/gcc-common-1.cfg | 46 ++++++++++++++-----
source-builder/config/nxlib-1.cfg | 2 +-
source-builder/config/swig-4-1.cfg | 5 +-
13 files changed, 97 insertions(+), 41 deletions(-)
diff --git a/bare/config/devel/binutils-2.22-1.cfg
b/bare/config/devel/binutils-2.22-1.cfg
index e585483..33a152a 100644
--- a/bare/config/devel/binutils-2.22-1.cfg
+++ b/bare/config/devel/binutils-2.22-1.cfg
@@ -10,6 +10,8 @@
%include %{_configdir}/base.cfg
%define binutils_version 2.22
+%hash sha512 binutils-2.22.tar.bz2 \
+
/+jvJj75kYPozII/6Eh/99D3v5qO/ShTtfRjasoAI4UNE95OrH13pfaUE9ilDm+VuxRWm+U9+GwLzjgDRSWrdA==
#
# The binutils build instructions. We use 2.xx Release 1.
diff --git a/bare/config/devel/binutils-2.24-1.cfg
b/bare/config/devel/binutils-2.24-1.cfg
index 652c274..52499e3 100644
--- a/bare/config/devel/binutils-2.24-1.cfg
+++ b/bare/config/devel/binutils-2.24-1.cfg
@@ -8,6 +8,8 @@
%include %{_configdir}/base.cfg
%define binutils_version 2.24
+%hash sha512 binutils-2.24.tar.bz2 \
+
Xsla1H1JsSxFWKjbDKIQnT7hlV43dgV/MzDEUG+PTRz15QX7+KFrmEA6D83qr5hv4KIr5kViR9vazmPOH3drEg==
#
# Enable deterministic archives by default. This will be the default
diff --git a/bare/config/devel/gcc-4.6-newlib-1.20-1.cfg
b/bare/config/devel/gcc-4.6-newlib-1.20-1.cfg
index 659752f..e2374aa 100644
--- a/bare/config/devel/gcc-4.6-newlib-1.20-1.cfg
+++ b/bare/config/devel/gcc-4.6-newlib-1.20-1.cfg
@@ -11,13 +11,22 @@
%define gcc_version 4.6.3
%define newlib_version 1.20.0
-%define mpfr_version 3.0.1
-%define mpc_version 0.8.2
-%define gmp_version 5.0.5
+%define mpfr_version 3.1.4
+%define mpc_version 1.0.3
+%define gmp_version 6.1.0
-%define mpc_url https://www.multiprecision.org/downloads
-%define gmp_url https://ftp.gnu.org/gnu/gmp
-%define mpfr_url https://ftp.gnu.org/gnu/mpfr
+%hash sha512 gcc-core-4.6.3.tar.bz2 \
+
ucVpu3E/OrCp1PbomMfQGRRUb7vmH021FRU2/+N0SQrm8VTfojgatgcrKJC3YVT769+S8GDoVAT1SZfwFpcvTA==
+%hash sha512 gcc-g--4.6.3.tar.gz \
+
qVHKvglD9l+ziCNrHuemi3ebq0T4aTQIkzRseYbiVEkA0LZeTyUHxpdlXzaxajB3szQG1Zh8VtMGhYZda9tOGA==
+%hash sha512 newlib-1.20.0.tar.gz \
+
Kr8dMJgORgxNb/5NFoLjhAPQVgSOAGdTYiVnMeV/5nWdAehby6hCWNIRlBkm4TvzxjL/OCSTGoRMiyWW55VFHw==
+%hash sha512 mpfr-3.1.4.tar.bz2 \
+
UQZgZv8sEu0hmGBez2iEawyWtUitr6W4Dgx4bQ30iEEaXolzNY/OcZLcl3rU5oQUzxRQDjw5dG3mJGXrFFu4GQ==
+%hash sha512 mpc-1.0.3.tar.gz \
+
ACi3bfEwcgwfrX3pN6DQQSJIBs5e92WJ8Zx7SdlWBxpoPi8g0VTBkqIx5pdWsZ5III8oibDBOVDOt7PPrwWaQw==
+%hash sha512 gmp-6.1.0.tar.bz2 \
+
PIKuq5wVltTaivrC7sOOQp6E8yEeGlcs+P0rVGSTxEwDm5IqETPqqki9fz4R2+eVo4TiHtlcvj7MWNesAiRhFw==
#
# Project custom message
diff --git a/bare/config/devel/gcc-4.9.1-newlib-2.1.0-1.cfg
b/bare/config/devel/gcc-4.9.1-newlib-2.1.0-1.cfg
index 495641e..acd5e84 100644
--- a/bare/config/devel/gcc-4.9.1-newlib-2.1.0-1.cfg
+++ b/bare/config/devel/gcc-4.9.1-newlib-2.1.0-1.cfg
@@ -8,9 +8,9 @@
%define gcc_version 4.9.1
%define newlib_version 2.1.0
-%define mpfr_version 3.0.1
-%define mpc_version 0.8.2
-%define gmp_version 5.0.5
+%define mpfr_version 3.1.4
+%define mpc_version 1.0.3
+%define gmp_version 6.1.0
%define with_threads 0
%define with_plugin 0
@@ -19,6 +19,17 @@
%define with_iconv 1
%endif
+%hash sha512 gcc-core-4.9.1.tar.bz2 \
+
hZgQakt8A7tNbin6G/qe5rY5DR8byobBzNJ67YMK4dEm2qUMQEEBbL+nYJDdZsUfHOBpWLjM1sO+UerodRJVkw==
+%hash sha512 newlib-2.1.0.tar.gz \
+
Z3CGT5MHq7JAGk5I8oaEXTpK/DCyrJh9pLlkpUhcw4I7MtBqCr9hUo6TxK2KOgqjzB7NOwM4UOayvebZu8mlRw==
+%hash sha512 mpfr-3.1.4.tar.bz2 \
+
UQZgZv8sEu0hmGBez2iEawyWtUitr6W4Dgx4bQ30iEEaXolzNY/OcZLcl3rU5oQUzxRQDjw5dG3mJGXrFFu4GQ==
+%hash sha512 mpc-1.0.3.tar.gz \
+
ACi3bfEwcgwfrX3pN6DQQSJIBs5e92WJ8Zx7SdlWBxpoPi8g0VTBkqIx5pdWsZ5III8oibDBOVDOt7PPrwWaQw==
+%hash sha512 gmp-6.1.0.tar.bz2 \
+
PIKuq5wVltTaivrC7sOOQp6E8yEeGlcs+P0rVGSTxEwDm5IqETPqqki9fz4R2+eVo4TiHtlcvj7MWNesAiRhFw==
+
#
# The gcc/newlib build instructions. We use 4.9 Release 1.
#
diff --git a/bare/config/devel/glib-2.46.2-1.cfg
b/bare/config/devel/glib-2.46.2-1.cfg
index 0dda685..fb82c38 100644
--- a/bare/config/devel/glib-2.46.2-1.cfg
+++ b/bare/config/devel/glib-2.46.2-1.cfg
@@ -12,13 +12,16 @@
%define glib_version_minor 2
%define glib_version %{glib_version_major}.%{glib_version_minor}
-%hash sha256 glib-%{glib_version}.tar.xz
5031722e37036719c1a09163cc6cf7c326e4c4f1f1e074b433c156862bd733db
+%hash sha256 glib-%{glib_version}.tar.xz \
+ 5031722e37036719c1a09163cc6cf7c326e4c4f1f1e074b433c156862bd733db
%patch add glib https://gaisler.se/qemu/glib-2.46.2-werror.patch
-%hash sha256 glib-2.46.2-werror.patch
389c00993f2890edaff6774d0dcfc7fcc99e92795ba913443fb9ec522f44a443
+%hash sha256 glib-2.46.2-werror.patch \
+ 389c00993f2890edaff6774d0dcfc7fcc99e92795ba913443fb9ec522f44a443
%patch add glib
https://gist.githubusercontent.com/roncapat/34eb82ece80ac26fd290a50dc7e85219/raw/247750ad17c31b26ef31af909fbcac05e57f71bd/glibc_2.46-2.1_rtems_5_rsb.patch
-
+%hash sha512 glibc_2.46-2.1-rtems_5_rsb.patch \
+
6fS0eaLKU/wsMGzwD/cGNycCVQebR9Jquj9pQQtUU+ZTLHuT7Toe1U1ApTXPY69DFngBNXZPsRnE5yUmmzzi/w==
#
# The GLib build instructions. We use 2.x.x Release 1.
diff --git a/bare/config/devel/or1ksim-1.1.0.cfg
b/bare/config/devel/or1ksim-1.1.0.cfg
index 5e6b592..994897b 100644
--- a/bare/config/devel/or1ksim-1.1.0.cfg
+++ b/bare/config/devel/or1ksim-1.1.0.cfg
@@ -9,7 +9,8 @@
%include %{_configdir}/base.cfg
%define or1ksim_version 1.1.0
-%hash md5 or1k-master.zip 7c9aec3fef6648a380ca5e91b2e3e87f
+%hash sha512 or1k-master.zip \
+
qi2pPthxvefp9OpwsAz3ul9lakJHkpwIgGlj4fcDa+Lshjsush2ekYm1SKsPJ38YaldSuJdH2buhCmPkXTeWHQ==
#
# The or1ksim build instructions. We use 1.x.x Release 1.
diff --git a/bare/config/devel/qemu4-git-1.cfg
b/bare/config/devel/qemu4-git-1.cfg
index 479aa20..155d6c8 100644
--- a/bare/config/devel/qemu4-git-1.cfg
+++ b/bare/config/devel/qemu4-git-1.cfg
@@ -37,7 +37,8 @@
d62ff3418903f1c5eb7f6d727af0400caeb250e23cc120111930601c9ecce02a
%patch add qemu
https://gist.githubusercontent.com/roncapat/34eb82ece80ac26fd290a50dc7e85219/raw/9445c0a954e92d3323596c51b1958c7be38b1cb4/qemu_4.10_rtems_5_rsb.patch
-
+%hash sha512 qemu_4.10_rtems_5_rsb.patch \
+
Ednm3ItS1N1hNWz3tQ7DSSY6IPRvUqha0aS7AgOfCgZrQ1Yzy9bmyr/O8gn3BhbejBOpeaS7iK52R4sbIJqHdw==
#
# The Qemu build instructions. We use 4.x.x Release 1.
#
diff --git a/rtems/config/graphics/libjpeg-9a-1.cfg
b/rtems/config/graphics/libjpeg-9a-1.cfg
index fef32d6..aa48749 100644
--- a/rtems/config/graphics/libjpeg-9a-1.cfg
+++ b/rtems/config/graphics/libjpeg-9a-1.cfg
@@ -13,7 +13,8 @@
#
%define libjpeg_version 9a
-%hash sha512 jpegsrc.v%{libjpeg_version}.tar.gz
9b21cc115e22c68bea46db462263c5c7a0d10beb192a919ecccbd801a25982b518ce44d8c301dd582ecaba1850e0e0f20e322be82b0e24ae917b9949b4f10d3b
+%hash sha512 jpegsrc.v%{libjpeg_version}.tar.gz \
+
iu2Aee2pRisVF0faGrRM5QfqfBZAxATPfrWrVWxYpHdCyj+sZwgM/6dOWUC8dc87Qej8X+j6UXYh15NiGktHrg==
#
# libjpeg Build configuration
diff --git a/source-builder/config/freetype-1.cfg
b/source-builder/config/freetype-1.cfg
index 95892dd..03ed603 100644
--- a/source-builder/config/freetype-1.cfg
+++ b/source-builder/config/freetype-1.cfg
@@ -17,7 +17,11 @@ URL: http://www.freetype.org/
#
# freetype Source
#
-%source set freetype
http://download.savannah.gnu.org/releases/freetype/freetype-%{freetype_version}.tar.gz
+# Use release 5.1 as the 5 branch version is no longer available on
savannah.gnu.org
+#
+%source set freetype \
+
https://ftp.rtems.org/pub/rtems/releases/5/5.1/sources/freetype-%{freetype_version}.tar.gz
+
#
# Prepare the source code.
#
diff --git a/source-builder/config/gcc-4.9-1.cfg
b/source-builder/config/gcc-4.9-1.cfg
index e28b560..1cad2f8 100644
--- a/source-builder/config/gcc-4.9-1.cfg
+++ b/source-builder/config/gcc-4.9-1.cfg
@@ -18,21 +18,18 @@
#
%source set newlib
https://sourceware.org/pub/newlib/newlib-%{newlib_version}.tar.gz
-#
-# Packages GCC requires
-#
-%source set mpfr
http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
-%source set mpc
http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
-%source set gmp https://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
-
%patch add gcc
--rsb-file=Make-lang.in-b09fb02bb4c0d16fc2c842bec4069c033897b5f2.patch -p1
https://gcc.gnu.org/git/?p=gcc.git;a=blobdiff_plain;f=gcc/cp/Make-lang.in;h=b09fb02bb4c0d16fc2c842bec4069c033897b5f2;hp=e98beb1e33e4bcc4943361c559ae71b7eb345346;hb=1e5f1089dec3af328fd03125d6778f666d0bd4e4;hpb=88375bb2ba8b9004a9924cdae894d7ff32972652
-%hash sha512 Make-lang.in-b09fb02bb4c0d16fc2c842bec4069c033897b5f2.patch
a47511de21fda0c0c314577ee295b8f2bc9f555084ceca88de12c931ebfe47e5fec349682085a7a1e8637e8e159b8f79188a56d42e54fda2ba5161d5bd3f56ac
+%hash sha512 Make-lang.in-b09fb02bb4c0d16fc2c842bec4069c033897b5f2.patch \
+
h0s+47lNCLhSKUjMuK6qILRHFeNpgsm/MulBzfqv934aPdryogCODhEdPiT5pUV02nMIzvg/kx7wus+8O6zTKQ==
%patch add gcc
--rsb-file=cfns.gperf.b09fb02bb4c0d16fc2c842bec4069c033897b5f2.patch -p1
https://gcc.gnu.org/git/?p=gcc.git;a=blobdiff_plain;f=gcc/cp/cfns.gperf;h=b09fb02bb4c0d16fc2c842bec4069c033897b5f2;hp=e98beb1e33e4bcc4943361c559ae71b7eb345346;hb=1e5f1089dec3af328fd03125d6778f666d0bd4e4;hpb=88375bb2ba8b9004a9924cdae894d7ff32972652
-%hash sha512 cfns.gperf.b09fb02bb4c0d16fc2c842bec4069c033897b5f2.patch
fdb49abb4f04ba627d6be7b0e0dd9bfdf3eb4b28c045627048bf1c56cabdf2c618cf084991bb847ac60c1eabf582a30ca1e0f4bfd943b9f34efd7e96879d251b
+%hash sha512 cfns.gperf.b09fb02bb4c0d16fc2c842bec4069c033897b5f2.patch \
+
nzj3FPeCC/NcOvuIzyd4EGoJFu3iqn1LUa8ya+P2hstwVLxiHGyvZKHaS1Cb0v7JlRCfhe6eftTZFmEzEqxCqw==
%patch add gcc
--rsb-file=cfns.h-b09fb02bb4c0d16fc2c842bec4069c033897b5f2.patch -p1
https://gcc.gnu.org/git/?p=gcc.git;a=blobdiff_plain;f=gcc/cp/cfns.h;h=b09fb02bb4c0d16fc2c842bec4069c033897b5f2;hp=e98beb1e33e4bcc4943361c559ae71b7eb345346;hb=1e5f1089dec3af328fd03125d6778f666d0bd4e4;hpb=88375bb2ba8b9004a9924cdae894d7ff32972652
-%hash sha512 cfns.h-b09fb02bb4c0d16fc2c842bec4069c033897b5f2.patch
ec0bd28a8266b136b99db4285c9a088c11fd7ba647dade5fb161308c00cb4189fa665e25ce6b139a7aa9740e97e617fd4e15ca506416dd9316e9fb7202f5c520
+%hash sha512 cfns.h-b09fb02bb4c0d16fc2c842bec4069c033897b5f2.patch \
+
Wl/1Njp/BOUEwxIVBZtElBLT2rSlBO545FuagJHbL/ajxCllSmtM6611QpWke16fzN/SDgyvkgsJxzfk76WaLw==
%patch add gcc
--rsb-file=except.c-b09fb02bb4c0d16fc2c842bec4069c033897b5f2.patch -p1
https://gcc.gnu.org/git/?p=gcc.git;a=blobdiff_plain;f=gcc/cp/except.c;h=b09fb02bb4c0d16fc2c842bec4069c033897b5f2;hp=e98beb1e33e4bcc4943361c559ae71b7eb345346;hb=1e5f1089dec3af328fd03125d6778f666d0bd4e4;hpb=88375bb2ba8b9004a9924cdae894d7ff32972652
-%hash sha512 except.c-b09fb02bb4c0d16fc2c842bec4069c033897b5f2.patch
ad05ceea98d7ec95fb2312b0f31aa6260f67119d7c796a1b8c1816fbcd2738edb626705594699bec22a2f770892589f6fc296e184d329bcb967ee2587fbfc5ba
+%hash sha512 except.c-b09fb02bb4c0d16fc2c842bec4069c033897b5f2.patch \
+
CyuFSBNswd7W8LVDjeOev7HSrQ19dqNEKiuDwNRn0pf02tAxuerxwONQP2fX5QkqwCNxiPnSwB6yzhu4RVSX/A==
#
# GCC Common build script.
diff --git a/source-builder/config/gcc-common-1.cfg
b/source-builder/config/gcc-common-1.cfg
index 4e13efc..933202a 100644
--- a/source-builder/config/gcc-common-1.cfg
+++ b/source-builder/config/gcc-common-1.cfg
@@ -34,7 +34,7 @@ URL: http://gcc.gnu.org/
# Default LTO to off.
#
%ifn %{defined with_lto}
- %define with_lto 0
+ %define enable_lto 1
%endif
#
@@ -46,15 +46,37 @@ URL: http://gcc.gnu.org/
%define rtems_gcc_version %{rtems_version}
%endif
+#
+# Packages GCC URLs, can be defined for older packages
+#
+%if %{!defined cloog_url}
+ %define cloog_url https://gcc.gnu.org/pub/gcc/infrastructure
+%endif
+%if %{!defined isl_url}
+ %define isl_url https://gcc.gnu.org/pub/gcc/infrastructure
+%endif
+%if %{!defined mpc_url}
+ %define mpc_url https://gcc.gnu.org/pub/gcc/infrastructure
+%endif
+%if %{!defined gmp_url}
+ %define gmp_url https://gcc.gnu.org/pub/gcc/infrastructure
+%endif
+%if %{!defined mpfr_url}
+ %define mpfr_url https://gcc.gnu.org/pub/gcc/infrastructure
+%endif
+
#
# Packages GCC requires
#
%if %{defined cloog_version}
-%source set cloog
https://gcc.gnu.org/pub/gcc/infrastructure/cloog-%{cloog_version}.tar.gz
+%source set cloog %{_url}/cloog-%{cloog_version}.tar.gz
%endif
%if %{defined isl_version}
-%source set isl
https://gcc.gnu.org/pub/gcc/infrastructure/isl-%{isl_version}.tar.bz2
+%source set isl %{isl_url}/isl-%{isl_version}.tar.bz2
%endif
+%source set mpc %{mpc_url}/mpc-%{mpc_version}.tar.gz
+%source set gmp %{gmp_url}/gmp-%{gmp_version}.tar.bz2
+%source set mpfr %{mpfr_url}/mpfr-%{mpfr_version}.tar.bz2
#
# Prepare the source code.
@@ -90,7 +112,7 @@ URL: http://gcc.gnu.org/
%source setup cloog -q -D -n cloog-%{cloog_version}
%patch setup cloog -p1
cd ${build_top}
- # Build MPFR one-tree style
+ # Build CLooG one-tree style
%{__rmfile} ${source_dir_gcc}/cloog
%{__ln_s} $PWD/${source_dir_cloog} ${source_dir_gcc}/cloog
%endif
@@ -101,7 +123,7 @@ URL: http://gcc.gnu.org/
%source setup isl -q -D -n isl-%{isl_version}
%patch setup isl -p1
cd ${build_top}
- # Build MPFR one-tree style
+ # Build ISL one-tree style
%{__rmfile} ${source_dir_gcc}/isl
%{__ln_s} $PWD/${source_dir_isl} ${source_dir_gcc}/isl
%endif
@@ -143,6 +165,10 @@ URL: http://gcc.gnu.org/
%build
build_top=$(pwd)
+ %if %{defined _internal_gsed_path}
+ export PATH=%{_internal_gsed_path}/bin:$PATH
+ %endif
+
%{build_directory}
mkdir -p ${build_dir}
@@ -162,11 +188,8 @@ URL: http://gcc.gnu.org/
%if %{enable_fortran}
languages="$languages,fortran"
%endif
-%if %{enable_java}
- languages="$languages,java"
-%endif
-%if %{enable_objc}
- languages="$languages,objc"
+%if %{enable_lto}
+ languages="$languages,lto"
%endif
%{host_build_flags}
@@ -188,10 +211,11 @@ URL: http://gcc.gnu.org/
--with-newlib \
--disable-nls --without-included-gettext \
--disable-win32-registry \
+ --disable-werror \
--enable-version-specific-runtime-libs \
- %{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \
--enable-newlib-io-c99-formats \
%{?disable_MAKEINFO:MAKEINFO=missing} \
+ %{?enable_newlib_tls:--enable-newlib-reent-thread-local} \
%{?with_iconv:--enable-newlib-iconv} \
%{?with_iconv:--enable-newlib-iconv-encodings=%{_newlib_iconv_encodings}} \
%{?with_threads:--enable-threads}%{!?with_threads:--disable-threads} \
diff --git a/source-builder/config/nxlib-1.cfg
b/source-builder/config/nxlib-1.cfg
index d177aa4..4ee56d3 100644
--- a/source-builder/config/nxlib-1.cfg
+++ b/source-builder/config/nxlib-1.cfg
@@ -17,7 +17,7 @@ URL: http://www.microwindows.org/
#
# nxlib Source
#
-%source set nxlib git://github.com/alex-sever-h/nxlib.git
+%source set nxlib https://github.com/alex-sever-h/nxlib.git
#
# Prepare the source code.
diff --git a/source-builder/config/swig-4-1.cfg
b/source-builder/config/swig-4-1.cfg
index 6c10114..897a9fa 100644
--- a/source-builder/config/swig-4-1.cfg
+++ b/source-builder/config/swig-4-1.cfg
@@ -16,8 +16,9 @@ URL: http://www.swig.org/
#
# Source
#
-%source set swig --rsb-file=swig-rel-%{swig_version}.tar.gz
https://github.com/swig/swig/archive/rel-%{swig_version}.tar.gz
-%source set pcre https://ftp.pcre.org/pub/pcre/pcre-%{pcre_version}.tar.bz2
+%source set swig --rsb-file=swig-rel-%{swig_version}.tar.gz \
+ https://github.com/swig/swig/archive/rel-%{swig_version}.tar.gz
+%source set pcre
https://sourceforge.net/projects/pcre/files/pcre/%{pcre_version}/pcre-%{pcre_version}.tar.bz2/download
#
# See if a special swig prefix is provided
--
2.37.1
_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
