From 4c52a95cec852a935eac283bca5b5d586bb1b1e9 Mon Sep 17 00:00:00 2001 From: Jeremy Soller <jeremy@system76.com> Date: Sun, 28 Feb 2021 08:09:11 -0700 Subject: [PATCH] Use Redox mirror of config repository --- recipes/atk/recipe.sh | 2 +- recipes/autoconf/recipe.sh | 2 +- recipes/automake/recipe.sh | 2 +- recipes/bash/recipe.sh | 2 +- recipes/bash/recipe.toml | 2 +- recipes/curl/recipe.sh | 2 +- recipes/curl/recipe.toml | 2 +- recipes/dosbox/recipe.sh | 2 +- recipes/fontconfig/recipe.sh | 2 +- recipes/freeciv/recipe.sh | 2 +- recipes/gettext/recipe.sh | 2 +- recipes/gettext/recipe.toml | 2 +- recipes/harfbuzz/recipe.sh | 2 +- recipes/libffi/recipe.sh | 2 +- recipes/libogg/recipe.sh | 2 +- recipes/libpng/recipe.sh | 2 +- recipes/libpng/recipe.toml | 2 +- recipes/mesa_glu/recipe.sh | 2 +- recipes/openjazz/recipe.sh | 2 +- recipes/pango/recipe.sh | 2 +- recipes/patch/recipe.sh | 2 +- recipes/perl/recipe.sh | 2 +- recipes/pkg-config/recipe.sh | 2 +- recipes/prboom/recipe.sh | 2 +- recipes/scummvm/recipe.sh | 2 +- recipes/sopwith/recipe.sh | 2 +- recipes/timidity/recipe.sh | 2 +- recipes/vice/recipe.sh | 2 +- recipes/vttest/recipe.sh | 2 +- recipes/xz/recipe.sh | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) diff --git a/recipes/atk/recipe.sh b/recipes/atk/recipe.sh index 802853de5..1451b72b4 100755 --- a/recipes/atk/recipe.sh +++ b/recipes/atk/recipe.sh @@ -13,7 +13,7 @@ function recipe_update { } function recipe_build { - wget -O config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub + wget -O config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" sysroot="$(realpath ../sysroot)" export CFLAGS="-I$sysroot/include" export LDFLAGS="-L$sysroot/lib --static" diff --git a/recipes/autoconf/recipe.sh b/recipes/autoconf/recipe.sh index ff9e0242d..28fe7211e 100644 --- a/recipes/autoconf/recipe.sh +++ b/recipes/autoconf/recipe.sh @@ -12,7 +12,7 @@ function recipe_update { } function recipe_build { - wget -O build-aux/config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub + wget -O build-aux/config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" ./configure --build=${BUILD} --host=${HOST} --prefix='' "$REDOX_MAKE" -j"$($NPROC)" skip=1 diff --git a/recipes/automake/recipe.sh b/recipes/automake/recipe.sh index 92649e648..9f97b2c0a 100644 --- a/recipes/automake/recipe.sh +++ b/recipes/automake/recipe.sh @@ -12,7 +12,7 @@ function recipe_update { } function recipe_build { - wget -O lib/config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub + wget -O lib/config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" sed -i 's|.*/doc/help2man.*|\&\& true|' Makefile.in sed -i 's|install-info-am install-man|install-info-am|' Makefile.in diff --git a/recipes/bash/recipe.sh b/recipes/bash/recipe.sh index c0a952e08..d5545b2b0 100644 --- a/recipes/bash/recipe.sh +++ b/recipes/bash/recipe.sh @@ -16,7 +16,7 @@ function recipe_build { sysroot="$PWD/../sysroot" export LDFLAGS="-L$sysroot/lib -static" export CPPFLAGS="-I$sysroot/include" - wget -O support/config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub + wget -O support/config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" ./configure \ --build=${BUILD} \ --host=${HOST} \ diff --git a/recipes/bash/recipe.toml b/recipes/bash/recipe.toml index be87f9d68..685091a98 100644 --- a/recipes/bash/recipe.toml +++ b/recipes/bash/recipe.toml @@ -4,7 +4,7 @@ patches = [ "redox.patch" ] script = """ -wget -O support/config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub +wget -O support/config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" """ [build] diff --git a/recipes/curl/recipe.sh b/recipes/curl/recipe.sh index 3222b8e04..e9554ac4b 100644 --- a/recipes/curl/recipe.sh +++ b/recipes/curl/recipe.sh @@ -19,7 +19,7 @@ function recipe_build { sysroot="$(realpath ../sysroot)" export CFLAGS="-I$sysroot/include" export LDFLAGS="-L$sysroot/lib --static" - wget -O config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub + wget -O config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" autoreconf -i ./configure \ --prefix=/ \ diff --git a/recipes/curl/recipe.toml b/recipes/curl/recipe.toml index 39af949ff..244f9c653 100644 --- a/recipes/curl/recipe.toml +++ b/recipes/curl/recipe.toml @@ -11,7 +11,7 @@ dependencies = [ ] script = """ rsync -av --delete "${COOKBOOK_SOURCE}/" ./ -wget -O config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub +wget -O config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" autoreconf -i COOKBOOK_CONFIGURE="./configure" COOKBOOK_CONFIGURE_FLAGS=( diff --git a/recipes/dosbox/recipe.sh b/recipes/dosbox/recipe.sh index e6b121fc1..45b11c958 100644 --- a/recipes/dosbox/recipe.sh +++ b/recipes/dosbox/recipe.sh @@ -18,7 +18,7 @@ function recipe_build { export CPPFLAGS="-I$sysroot/include/SDL" export LDFLAGS="-L$sysroot/lib -static" ./autogen.sh - wget -O config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub + wget -O config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" ./configure \ --build=${BUILD} \ --host=${HOST} \ diff --git a/recipes/fontconfig/recipe.sh b/recipes/fontconfig/recipe.sh index 7996d983c..81f034092 100755 --- a/recipes/fontconfig/recipe.sh +++ b/recipes/fontconfig/recipe.sh @@ -13,7 +13,7 @@ function recipe_update { } function recipe_build { - wget -O config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub + wget -O config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" sysroot="$(realpath ../sysroot)" export CFLAGS="-I$sysroot/include" export LDFLAGS="-L$sysroot/lib --static" diff --git a/recipes/freeciv/recipe.sh b/recipes/freeciv/recipe.sh index 9caae43ab..b62660d90 100644 --- a/recipes/freeciv/recipe.sh +++ b/recipes/freeciv/recipe.sh @@ -13,7 +13,7 @@ function recipe_update { } function recipe_build { - wget -O bootstrap/config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub + wget -O bootstrap/config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" sysroot="$(realpath ../sysroot)" export CFLAGS="-I$sysroot/include" export LDFLAGS="-L$sysroot/lib" diff --git a/recipes/gettext/recipe.sh b/recipes/gettext/recipe.sh index 056f0959c..bffce9cc7 100644 --- a/recipes/gettext/recipe.sh +++ b/recipes/gettext/recipe.sh @@ -16,7 +16,7 @@ function recipe_build { sysroot="$(realpath ../sysroot)" export CFLAGS="-I$sysroot/include" export LDFLAGS="-L$sysroot/lib --static" - wget -O build-aux/config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub + wget -O build-aux/config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" ./configure \ --build=${BUILD} \ --host=${HOST} \ diff --git a/recipes/gettext/recipe.toml b/recipes/gettext/recipe.toml index 4460b4494..3c653274a 100644 --- a/recipes/gettext/recipe.toml +++ b/recipes/gettext/recipe.toml @@ -4,7 +4,7 @@ patches = [ "redox.patch" ] script = """ -wget -O build-aux/config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub +wget -O build-aux/config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" """ [build] diff --git a/recipes/harfbuzz/recipe.sh b/recipes/harfbuzz/recipe.sh index f7cce8908..e36ffcc46 100644 --- a/recipes/harfbuzz/recipe.sh +++ b/recipes/harfbuzz/recipe.sh @@ -16,7 +16,7 @@ function recipe_build { sysroot="$(realpath ../sysroot)" export CFLAGS="-I$sysroot/include" export LDFLAGS="-L$sysroot/lib --static" - #wget -O build-aux/config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub + #wget -O build-aux/config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" FREETYPE_CFLAGS="$("${PKG_CONFIG}" --cflags freetype2)" FREETYPE_LIBS="$("${PKG_CONFIG}" --libs freetype2)" ./configure \ diff --git a/recipes/libffi/recipe.sh b/recipes/libffi/recipe.sh index a78c84f6f..b7f841c39 100644 --- a/recipes/libffi/recipe.sh +++ b/recipes/libffi/recipe.sh @@ -16,7 +16,7 @@ function recipe_build { sysroot="$(realpath ../sysroot)" export CFLAGS="-I$sysroot/include" export LDFLAGS="-L$sysroot/lib" - wget -O config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub + wget -O config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" ./configure \ --build=${BUILD} \ --host=${HOST} \ diff --git a/recipes/libogg/recipe.sh b/recipes/libogg/recipe.sh index 577e7b1a8..0472da582 100644 --- a/recipes/libogg/recipe.sh +++ b/recipes/libogg/recipe.sh @@ -13,7 +13,7 @@ function recipe_update { } function recipe_build { - wget -O config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub + wget -O config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" ./configure \ --build=${BUILD} \ diff --git a/recipes/libpng/recipe.sh b/recipes/libpng/recipe.sh index ab3e9743b..5c30af562 100644 --- a/recipes/libpng/recipe.sh +++ b/recipes/libpng/recipe.sh @@ -17,7 +17,7 @@ function recipe_build { export CPPFLAGS="-I$sysroot/include" export LDFLAGS="-L$sysroot/lib --static" chmod +w config.sub - wget -O config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub + wget -O config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" ./configure --build=${BUILD} --host=${HOST} --prefix='/' "$REDOX_MAKE" -j"$($NPROC)" skip=1 diff --git a/recipes/libpng/recipe.toml b/recipes/libpng/recipe.toml index ed7b95f14..0c6f6942a 100644 --- a/recipes/libpng/recipe.toml +++ b/recipes/libpng/recipe.toml @@ -2,7 +2,7 @@ tar = "https://github.com/glennrp/libpng/archive/v1.6.36.tar.gz" script = """ chmod +w config.sub -wget -O config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub +wget -O config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" """ diff --git a/recipes/mesa_glu/recipe.sh b/recipes/mesa_glu/recipe.sh index 86b0baa02..83667dcec 100644 --- a/recipes/mesa_glu/recipe.sh +++ b/recipes/mesa_glu/recipe.sh @@ -17,7 +17,7 @@ function recipe_build { export CFLAGS="-I$sysroot/include" export CPPFLAGS="-I$sysroot/include" export LDFLAGS="-L$sysroot/lib" - wget -O config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub + wget -O config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" ./configure --build=${BUILD} --host="${HOST}" --prefix=/ --enable-osmesa "$REDOX_MAKE" -j"$($NPROC)" skip=1 diff --git a/recipes/openjazz/recipe.sh b/recipes/openjazz/recipe.sh index 847b5d1d2..d6a7bc67c 100644 --- a/recipes/openjazz/recipe.sh +++ b/recipes/openjazz/recipe.sh @@ -20,7 +20,7 @@ function recipe_build { touch INSTALL NEWS README AUTHORS ChangeLog COPYING autoreconf -fvi autoconf - wget -O build-aux/config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub + wget -O build-aux/config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" ./configure --build=${BUILD} --host=${HOST} --prefix='' "$REDOX_MAKE" -j"$($NPROC)" V=1 skip=1 diff --git a/recipes/pango/recipe.sh b/recipes/pango/recipe.sh index 24f77bb2d..6b051eab1 100755 --- a/recipes/pango/recipe.sh +++ b/recipes/pango/recipe.sh @@ -13,7 +13,7 @@ function recipe_update { } function recipe_build { - wget -O config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub + wget -O config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" sysroot="$(realpath ../sysroot)" export CFLAGS="-I$sysroot/include" export LDFLAGS="-L$sysroot/lib --static" diff --git a/recipes/patch/recipe.sh b/recipes/patch/recipe.sh index 3c65091a7..3e46d2ab4 100644 --- a/recipes/patch/recipe.sh +++ b/recipes/patch/recipe.sh @@ -13,7 +13,7 @@ function recipe_update { function recipe_build { export LDFLAGS="-static" - wget -O build-aux/config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub + wget -O build-aux/config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" autoreconf ./configure --build=${BUILD} --host=${HOST} --prefix=/ "$REDOX_MAKE" -j"$($NPROC)" diff --git a/recipes/perl/recipe.sh b/recipes/perl/recipe.sh index 8e03557ce..39c9cce6e 100644 --- a/recipes/perl/recipe.sh +++ b/recipes/perl/recipe.sh @@ -16,7 +16,7 @@ function recipe_update { function recipe_build { curl -L -O --time-cond perl-cross-1.1.6.tar.gz https://github.com/arsv/perl-cross/releases/download/1.1.6/perl-cross-1.1.6.tar.gz tar --strip-components=1 -xvf perl-cross-1.1.6.tar.gz - wget -O cnf/config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub + wget -O cnf/config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" sysroot="$($HOST-gcc -print-sysroot)" ./configure --build=${BUILD} --target=${HOST} --prefix='/' --sysroot="$sysroot" --disable-mod=Sys-Syslog,Time-HiRes --with-libs='m' sed -i "s/^#define Netdb_name_t.*/#define Netdb_name_t const char*/" config.h # XXX diff --git a/recipes/pkg-config/recipe.sh b/recipes/pkg-config/recipe.sh index 4e1accb2f..0514e9168 100755 --- a/recipes/pkg-config/recipe.sh +++ b/recipes/pkg-config/recipe.sh @@ -13,7 +13,7 @@ function recipe_update { } function recipe_build { - wget -O config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub + wget -O config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" export LDFLAGS="--static" ./configure \ --build="${BUILD}" \ diff --git a/recipes/prboom/recipe.sh b/recipes/prboom/recipe.sh index 4569fc606..77c8c8cd2 100644 --- a/recipes/prboom/recipe.sh +++ b/recipes/prboom/recipe.sh @@ -16,7 +16,7 @@ function recipe_build { export CFLAGS="-static" sysroot="$(realpath ../sysroot)" autoreconf -if - wget -O autotools/config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub + wget -O autotools/config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" ./configure \ --prefix=/ \ --build=${BUILD} \ diff --git a/recipes/scummvm/recipe.sh b/recipes/scummvm/recipe.sh index 97efd01dd..df55a301d 100644 --- a/recipes/scummvm/recipe.sh +++ b/recipes/scummvm/recipe.sh @@ -14,7 +14,7 @@ function recipe_update { } function recipe_build { - wget -O config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub + wget -O config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" sysroot="$(realpath ../sysroot)" export LDFLAGS="-static" ./configure \ diff --git a/recipes/sopwith/recipe.sh b/recipes/sopwith/recipe.sh index 5614139e6..678f56f72 100644 --- a/recipes/sopwith/recipe.sh +++ b/recipes/sopwith/recipe.sh @@ -13,7 +13,7 @@ function recipe_update { } function recipe_build { - wget -O autotools/config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub + wget -O autotools/config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" sysroot="$(realpath ../sysroot)" export CFLAGS="-I$sysroot/include -I$sysroot/include/SDL" export LDFLAGS="-L$sysroot/lib -static" diff --git a/recipes/timidity/recipe.sh b/recipes/timidity/recipe.sh index d9c589905..4a0a15271 100644 --- a/recipes/timidity/recipe.sh +++ b/recipes/timidity/recipe.sh @@ -16,7 +16,7 @@ function recipe_update { function recipe_build { export LDFLAGS="-static" autoreconf -f -i - wget -O autoconf/config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub + wget -O autoconf/config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" ./configure \ --build=${BUILD} \ --host=${HOST} \ diff --git a/recipes/vice/recipe.sh b/recipes/vice/recipe.sh index e024210d6..1c0c64c55 100644 --- a/recipes/vice/recipe.sh +++ b/recipes/vice/recipe.sh @@ -15,7 +15,7 @@ function recipe_update { function recipe_build { sysroot="$(realpath ../sysroot)" - wget -O config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub + wget -O config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" export sdl_config="$sysroot/bin/sdl-config" export CFLAGS="-I$sysroot/include -I$sysroot/include/SDL" diff --git a/recipes/vttest/recipe.sh b/recipes/vttest/recipe.sh index a5c17fc1b..35976b8d4 100644 --- a/recipes/vttest/recipe.sh +++ b/recipes/vttest/recipe.sh @@ -13,7 +13,7 @@ function recipe_update { function recipe_build { export LDFLAGS="-static" - wget -O config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub + wget -O config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" ./configure \ --build=${BUILD} \ --host=${HOST} \ diff --git a/recipes/xz/recipe.sh b/recipes/xz/recipe.sh index 239add356..b22738ec8 100644 --- a/recipes/xz/recipe.sh +++ b/recipes/xz/recipe.sh @@ -25,7 +25,7 @@ function recipe_build { ./autogen.sh chmod +w build-aux/config.sub - wget -O build-aux/config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub + wget -O build-aux/config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false" ./configure \ --build=${BUILD} \ --host=${HOST} \ -- GitLab