From 3cb78b0b815ba05d17f5c65865d246a8333aa087 Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Wed, 17 Aug 2022 09:27:42 +1000 Subject: config: Various updates to fix downloading of sources --- bare/config/devel/gcc-4.6-newlib-1.20-1.cfg | 4 ++++ bare/config/devel/or1ksim-1.1.0.cfg | 3 ++- bare/config/devel/pcre-8.40-1.cfg | 3 ++- bare/config/devel/qemu-xilinx-v2020.2-1.cfg | 2 +- bare/config/gnu-tools-4.6.bset | 6 +++--- bare/config/gnu-tools-4.8.2.bset | 25 ------------------------- rtems/config/graphics/libjpeg-9a-1.cfg | 3 ++- rtems/config/net-mgmt/net-snmp-5.7.2.1-1.cfg | 8 +++++--- rtems/config/rtems-urls.bset | 2 ++ source-builder/config/freetype-1.cfg | 2 +- source-builder/config/gcc-4.9-1.cfg | 12 ++++++++---- source-builder/config/libtool-2-1.cfg | 8 ++++---- source-builder/config/nxlib-1.cfg | 2 +- source-builder/config/pcre-8-1.cfg | 2 +- source-builder/config/swig-4-1.cfg | 5 +++-- 15 files changed, 39 insertions(+), 48 deletions(-) delete mode 100644 bare/config/gnu-tools-4.8.2.bset 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 0a7cc63..659752f 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 @@ -15,6 +15,10 @@ %define mpc_version 0.8.2 %define gmp_version 5.0.5 +%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 + # # Project custom message # diff --git a/bare/config/devel/or1ksim-1.1.0.cfg b/bare/config/devel/or1ksim-1.1.0.cfg index 5e6b592..d4ccc88 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/pcre-8.40-1.cfg b/bare/config/devel/pcre-8.40-1.cfg index f6031fd..85ec7a1 100644 --- a/bare/config/devel/pcre-8.40-1.cfg +++ b/bare/config/devel/pcre-8.40-1.cfg @@ -9,7 +9,8 @@ %include %{_configdir}/base.cfg %define pcre_version 8.40 -%hash sha512 pcre-%{pcre_version}.tar.bz2 tMJ+r73zO9ehOEZVsZNvS+O8Z0XAcjR+sm6YiJbFJmS9haxCRE2hvni24g9Ftsflkh9fIPWwdBtb09mETlvU4g== +%hash sha512 pcre-%{pcre_version}.tar.bz2 \ + tMJ+r73zO9ehOEZVsZNvS+O8Z0XAcjR+sm6YiJbFJmS9haxCRE2hvni24g9Ftsflkh9fIPWwdBtb09mETlvU4g== # # The PCRE build instructions. We use 8.x Release 1. diff --git a/bare/config/devel/qemu-xilinx-v2020.2-1.cfg b/bare/config/devel/qemu-xilinx-v2020.2-1.cfg index 94b14ef..180b621 100644 --- a/bare/config/devel/qemu-xilinx-v2020.2-1.cfg +++ b/bare/config/devel/qemu-xilinx-v2020.2-1.cfg @@ -15,7 +15,7 @@ # # Checkout the version tag and initialize all submodules. # -%source set qemu git://github.com/Xilinx/qemu.git?checkout=%{qemu_version}?submodule=dtc?submodule=slirp?submodule=ui/keycodemapdb?submodule=tests/fp/berkeley-softfloat-3?submodule=tests/fp/berkeley-testfloat-3 +%source set qemu https://github.com/Xilinx/qemu.git?checkout=%{qemu_version}?submodule=dtc?submodule=slirp?submodule=ui/keycodemapdb?submodule=tests/fp/berkeley-softfloat-3?submodule=tests/fp/berkeley-testfloat-3 # # The Qemu build instructions. We use 5.x.x Release 1. diff --git a/bare/config/gnu-tools-4.6.bset b/bare/config/gnu-tools-4.6.bset index fa3ced8..baccd84 100644 --- a/bare/config/gnu-tools-4.6.bset +++ b/bare/config/gnu-tools-4.6.bset @@ -19,7 +19,7 @@ package: gnu-tool-%{_target}-%{_host}-%{release} # # Tool configuration. # -binutils-2.22-1 -gcc-4.6-newlib-1.20-1 -expat-2.1.0-1 +devel/binutils-2.22-1 +devel/gcc-4.6-newlib-1.20-1 +devel/expat-2.1.0-1 gdb-7.5-1 diff --git a/bare/config/gnu-tools-4.8.2.bset b/bare/config/gnu-tools-4.8.2.bset deleted file mode 100644 index 9dd4b8a..0000000 --- a/bare/config/gnu-tools-4.8.2.bset +++ /dev/null @@ -1,25 +0,0 @@ -# -# GNU Tools Set -# - -%define release 1 - -package: gnu-tools-%{_target}-%{_host}-%{release} - -# -# Project custom message -# -%define gcc_version_message SB-%{release},gcc-%{gcc_version}/newlib-%{newlib_version} - -# -# Enable G++ -# -%define enable_cxx 1 - -# -# Tool configuration. -# -devel/expat-2.1.0-1 -devel/binutils-2.23.2-1 -devel/gcc-4.8.2-newlib-cvs-1 -devel/gdb-7.6.1-1 diff --git a/rtems/config/graphics/libjpeg-9a-1.cfg b/rtems/config/graphics/libjpeg-9a-1.cfg index fef32d6..04d2324 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 \ + z4PhNX7vuL3xVChQ1m2AB9Yg5AULVxXcg/SpIdNs6c5H0NE8XYXysP+DGNKHfuwvY7kxvUdBeoGlODJ6+SfaPg== # # libjpeg Build configuration diff --git a/rtems/config/net-mgmt/net-snmp-5.7.2.1-1.cfg b/rtems/config/net-mgmt/net-snmp-5.7.2.1-1.cfg index e4fe63e..8d4a018 100644 --- a/rtems/config/net-mgmt/net-snmp-5.7.2.1-1.cfg +++ b/rtems/config/net-mgmt/net-snmp-5.7.2.1-1.cfg @@ -13,7 +13,8 @@ # %define net_snmp_version 5.7.2.1 -%hash sha512 net-snmp-%{net_snmp_version}.tar.gz 6c4dadd145cab9572e2559ad99d6794469685086771c6d757d3667da1a061ab86746d53c28d48381c59a90d92b1812b813f3176cff156c41929177fb585299d0 +%hash sha512 net-snmp-%{net_snmp_version}.tar.gz \ + bE2t0UXKuVcuJVmtmdZ5RGloUIZ3HG11fTZn2hoGGrhnRtU8KNSDgcWakNkrGBK4E/MXbP8VbEGSkXf7WFKZ0A== # # We need some special flags to build this version. @@ -23,8 +24,9 @@ # # Patch for RTEMS support. # -%patch add net-snmp %{rtems_git_tools}/net-snmp/rtems-net-snmp-5.7.2.1-20190704.patch -#%hash sha512 rtems-net-snmp-5.7.2.1-20140623.patch 4eb987d88c6414f2e07d725c2ebb3e88a40191c7befce879cae9ef67143dc25aa88942cfc525d36cd3683476d1cc0f5882d4a730d3bb9c53be2c7a079874d7dd +%patch add net-snmp %{rtems_devel_ticket}/4703/rtems-net-snmp-5.7.2.1-20140623.patch +%hash sha512 rtems-net-snmp-5.7.2.1-20140623.patch \ + VGixB0xtgUzmWEPvXtVi33m2+A+W0neDfg1vL1i3WXFLbg5WLIdVwifacgvJzT6aSIB5+wBFUaiaCa6PxNPkxA== # # NetSNMP Build configuration diff --git a/rtems/config/rtems-urls.bset b/rtems/config/rtems-urls.bset index 91e4bad..b096b88 100644 --- a/rtems/config/rtems-urls.bset +++ b/rtems/config/rtems-urls.bset @@ -6,6 +6,8 @@ # The RTEMS http git URL. # %define rtems_http_git https://git.rtems.org +%define rtems_http_devel https://devel.rtems.org +%define rtems_devel_ticket https://devel.rtems.org/attachment/ticket %define rtems_git_tools %{rtems_http_git}/rtems-tools/plain/tools/%{rtems_version} %define rtems_autoconf_patches %{rtems_git_tools}/autoconf %define rtems_automake_patches %{rtems_git_tools}/automake diff --git a/source-builder/config/freetype-1.cfg b/source-builder/config/freetype-1.cfg index 95892dd..917f3d9 100644 --- a/source-builder/config/freetype-1.cfg +++ b/source-builder/config/freetype-1.cfg @@ -17,7 +17,7 @@ URL: http://www.freetype.org/ # # freetype Source # -%source set freetype http://download.savannah.gnu.org/releases/freetype/freetype-%{freetype_version}.tar.gz +%source set freetype https://download.savannah.gnu.org/releases/freetype/freetype-old/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 73d2e4c..af3d336 100644 --- a/source-builder/config/gcc-4.9-1.cfg +++ b/source-builder/config/gcc-4.9-1.cfg @@ -19,13 +19,17 @@ %source set newlib https://sourceware.org/pub/newlib/newlib-%{newlib_version}.tar.gz %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/libtool-2-1.cfg b/source-builder/config/libtool-2-1.cfg index e834e87..52a09f7 100644 --- a/source-builder/config/libtool-2-1.cfg +++ b/source-builder/config/libtool-2-1.cfg @@ -4,11 +4,11 @@ # This configuration file configure's, make's and install's libtool # -%ifn %{defined _internal_autotools} +%if %{!defined _internal_autotools} %define _internal_autotools no - %ifn %{defined _internal_autotools_path} - %define _internal_autotools_path %{nil} - %endif +%endif +%if %{!defined _internal_autotools_path} + %define _internal_autotools_path %{_prefix} %endif Name: libtool-%{libtool_version}-%{_host}-%{release} 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/pcre-8-1.cfg b/source-builder/config/pcre-8-1.cfg index 461967f..8d854d8 100644 --- a/source-builder/config/pcre-8-1.cfg +++ b/source-builder/config/pcre-8-1.cfg @@ -20,7 +20,7 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n) # # Source # -%source set pcre https://ftp.pcre.org/pub/pcre/pcre-%{pcre_version}.tar.bz2 +%source set pcre https://sourceforge.net/projects/pcre/files/pcre/%{pcre_version}/pcre-%{pcre_version}.tar.bz2/download # # 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 -- cgit v1.2.3