File tree 38 files changed +49
-45
lines changed
38 files changed +49
-45
lines changed Original file line number Diff line number Diff line change @@ -65,8 +65,8 @@ installopts=()
65
65
configscript=configure
66
66
configopts=()
67
67
useconfigure=false
68
- config_sub_path= config.sub
69
- config_guess_path= config.guess
68
+ config_sub_paths=( " config.sub" )
69
+ config_guess_paths=( " config.guess" )
70
70
use_fresh_config_sub=false
71
71
use_fresh_config_guess=false
72
72
depends=()
@@ -141,11 +141,15 @@ get_new_config_guess() {
141
141
}
142
142
143
143
ensure_new_config_sub () {
144
- get_new_config_sub " $config_sub_path "
144
+ for path in " ${config_sub_paths[@]} " ; do
145
+ get_new_config_sub " ${path} "
146
+ done
145
147
}
146
148
147
149
ensure_new_config_guess () {
148
- get_new_config_guess " $config_guess_path "
150
+ for path in " ${config_guess_paths[@]} " ; do
151
+ get_new_config_guess " ${path} "
152
+ done
149
153
}
150
154
151
155
ensure_build () {
Original file line number Diff line number Diff line change @@ -177,10 +177,10 @@ if that's undesirable.
177
177
Boolean option (` false ` by default), will replace the ` config.sub ` pointed to by
178
178
` config_sub_path ` as part of the patching process if set to true.
179
179
180
- #### ` config_sub_path `
180
+ #### ` config_sub_paths `
181
181
182
- Path to the ` config.sub ` file used by autoconf, starting at ` $workdir ` .
183
- This is set to ` config.sub ` by default.
182
+ Paths to the ` config.sub ` files used by autoconf, starting at ` $workdir ` .
183
+ This is set to ` ( config.sub) ` by default.
184
184
185
185
#### ` configscript `
186
186
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ port=SDL2_mixer
3
3
version=2.0.4
4
4
useconfigure=true
5
5
use_fresh_config_sub=true
6
- config_sub_path= build-scripts/config.sub
6
+ config_sub_paths=( " build-scripts/config.sub" )
7
7
files=" https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-${version} .tar.gz SDL2_mixer-${version} .tar.gz b4cf5a382c061cd75081cf246c2aa2f9df8db04bdda8dcdc6b6cca55bede2419"
8
8
auth_type=sha256
9
9
depends=(" libmodplug" " libmpg123" " libvorbis" " SDL2" )
Original file line number Diff line number Diff line change @@ -4,8 +4,8 @@ version=5.1.16
4
4
useconfigure=true
5
5
use_fresh_config_sub=true
6
6
use_fresh_config_guess=true
7
- config_sub_path= support/config.sub
8
- config_guess_path= support/config.guess
7
+ config_sub_paths=( " support/config.sub" )
8
+ config_guess_paths=( " support/config.guess" )
9
9
configopts=(" --disable-nls" " --without-bash-malloc" )
10
10
files=" https://ftpmirror.gnu.org/gnu/bash/bash-${version} .tar.gz bash-${version} .tar.gz 5bac17218d3911834520dad13cd1f85ab944e1c09ae1aba55906be1f8192f558"
11
11
auth_type=" sha256"
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ port=coreutils
3
3
version=9.1
4
4
useconfigure=" true"
5
5
use_fresh_config_sub=" true"
6
- config_sub_path= build-aux/config.sub
6
+ config_sub_paths=( " build-aux/config.sub" )
7
7
files=" https://ftpmirror.gnu.org/gnu/coreutils/coreutils-${version} .tar.gz coreutils-${version} .tar.gz
8
8
https://ftpmirror.gnu.org/gnu/coreutils/coreutils-${version} .tar.gz.sig coreutils-${version} .tar.gz.sig
9
9
https://ftpmirror.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg"
Original file line number Diff line number Diff line change @@ -5,5 +5,5 @@ files="https://ftpmirror.gnu.org/gnu/diffutils/diffutils-${version}.tar.xz diffu
5
5
auth_type=sha256
6
6
useconfigure=true
7
7
use_fresh_config_sub=true
8
- config_sub_path= build-aux/config.sub
8
+ config_sub_paths=( " build-aux/config.sub" )
9
9
depends=(" libiconv" )
Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ files="https://github.com/westes/flex/releases/download/v${version}/flex-${versi
5
5
https://github.com/westes/flex/releases/download/v${version} /flex-${version} .tar.gz.sig flex-${version} .tar.gz.sig"
6
6
useconfigure=true
7
7
use_fresh_config_sub=true
8
- config_sub_path= build-aux/config.sub
8
+ config_sub_paths=( " build-aux/config.sub" )
9
9
configopts=(" --disable-bootstrap" )
10
10
depends=(" m4" " pcre2" )
11
11
auth_type=" sig"
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ port=freeciv
3
3
version=3.0.0-beta2
4
4
useconfigure=true
5
5
use_fresh_config_sub=true
6
- config_sub_path= bootstrap/config.sub
6
+ config_sub_paths=( " bootstrap/config.sub" )
7
7
configopts=(" --enable-client=sdl2" " --enable-fcmp=no" )
8
8
files=" http://files.freeciv.org/beta/freeciv-${version} .tar.xz freeciv-${version} .tar.xz 9f44dc28068b239c18bda68192ddb27622030880f8ab9c17f777eac28391269e"
9
9
auth_type=sha256
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ port=freedink
3
3
version=109.6
4
4
useconfigure=" true"
5
5
use_fresh_config_sub=" true"
6
- config_sub_path= autotools/config.sub
6
+ config_sub_paths=( " autotools/config.sub" )
7
7
depends=(" SDL2" " SDL2_image" " SDL2_mixer" " SDL2_ttf" " SDL2_gfx" " gettext" " fontconfig" " glm" )
8
8
freedink_data=" freedink-data-1.08.20190120"
9
9
files=" https://ftpmirror.gnu.org/gnu/freedink/freedink-${version} .tar.gz freedink-${version} .tar.gz
Original file line number Diff line number Diff line change @@ -3,11 +3,11 @@ port=freetype
3
3
version=2.12.0
4
4
useconfigure=true
5
5
use_fresh_config_sub=true
6
- config_sub_path= builds/unix/config.sub
6
+ config_sub_paths=( " builds/unix/config.sub" )
7
7
files=" https://download.savannah.gnu.org/releases/freetype/freetype-${version} .tar.gz freetype-${version} .tar.gz 7940a46eeb0255baaa87c553d72778c4f8daa2b8888c8e2a05766a2a8686740c"
8
8
auth_type=sha256
9
9
configopts=(" --with-brotli=no" " --with-bzip2=no" " --with-zlib=no" " --with-harfbuzz=no" " --with-png=no" )
10
- config_sub_path= " builds/unix/config.sub"
10
+ config_sub_paths=( " builds/unix/config.sub" )
11
11
12
12
install () {
13
13
run make DESTDIR=${SERENITY_INSTALL_ROOT} " ${installopts[@]} " install
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ port=gnucobol
3
3
version=3.1.2
4
4
useconfigure=" true"
5
5
use_fresh_config_sub=" true"
6
- config_sub_path= build_aux/config.sub
6
+ config_sub_paths=( " build_aux/config.sub" )
7
7
depends=(" gmp" " gcc" " bash" " ncurses" )
8
8
files=" https://ftpmirror.gnu.org/gnu/gnucobol/gnucobol-${version} .tar.bz2 gnucobol-${version} .tar.bz2
9
9
https://ftpmirror.gnu.org/gnu/gnucobol/gnucobol-${version} .tar.bz2.sig gnucobol-${version} .tar.bz2.sig
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ port=gnupg
3
3
version=2.3.0
4
4
useconfigure=true
5
5
use_fresh_config_sub=true
6
- config_sub_path= build-aux/config.sub
6
+ config_sub_paths=( " build-aux/config.sub" )
7
7
configopts=(" --with-libgpg-error-prefix=${SERENITY_INSTALL_ROOT} /usr/local"
8
8
" --with-libgcrypt-prefix=${SERENITY_INSTALL_ROOT} /usr/local"
9
9
" --with-libassuan-prefix=${SERENITY_INSTALL_ROOT} /usr/local"
Original file line number Diff line number Diff line change @@ -7,7 +7,7 @@ auth_type=sha256
7
7
8
8
useconfigure=true
9
9
use_fresh_config_sub=true
10
- config_sub_path= " build-aux/config.sub"
10
+ config_sub_paths=( " build-aux/config.sub" )
11
11
configopts=(" --disable-lto" " --disable-jit" )
12
12
pre_configure () {
13
13
run autoreconf
Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ https://ftpmirror.gnu.org/gnu/indent/indent-${version}.tar.gz.sig indent-${versi
6
6
https://ftpmirror.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg"
7
7
useconfigure=true
8
8
use_fresh_config_sub=true
9
- config_sub_path= config/config.sub
9
+ config_sub_paths=( " config/config.sub" )
10
10
auth_type=" sig"
11
11
auth_opts=(" --keyring" " ./gnu-keyring.gpg" " indent-${version} .tar.gz.sig" )
12
12
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ port=libarchive
3
3
version=3.6.1
4
4
useconfigure=true
5
5
use_fresh_config_sub=true
6
- config_sub_path= build/autoconf/config.sub
6
+ config_sub_paths=( " build/autoconf/config.sub" )
7
7
configopts=(" --without-xml2" )
8
8
files=" https://libarchive.org/downloads/libarchive-${version} .tar.gz libarchive-${version} .tar.gz
9
9
https://libarchive.org/downloads/libarchive-${version} .tar.gz.asc libarchive-${version} .tar.gz.asc"
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ port=libassuan
3
3
version=2.5.5
4
4
useconfigure=true
5
5
use_fresh_config_sub=true
6
- config_sub_path= build-aux/config.sub
6
+ config_sub_paths=( " build-aux/config.sub" )
7
7
depends=(" libgpg-error" )
8
8
files=" https://gnupg.org/ftp/gcrypt/libassuan/libassuan-${version} .tar.bz2 libassuan-${version} .tar.bz2 8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4"
9
9
auth_type=sha256
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ port=libexpat
3
3
version=2.4.8
4
4
useconfigure=true
5
5
use_fresh_config_sub=true
6
- config_sub_path= conftools/config.sub
6
+ config_sub_paths=( " conftools/config.sub" )
7
7
files=" https://github.com/libexpat/libexpat/releases/download/R_${version// ./ _} /expat-${version} .tar.xz expat-${version} .tar.xz
8
8
https://github.com/libexpat/libexpat/releases/download/R_${version// ./ _} /expat-${version} .tar.xz.asc expat-${version} .tar.xz.asc"
9
9
workdir=expat-${version}
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ port=libgcrypt
3
3
version=1.10.1
4
4
useconfigure=true
5
5
use_fresh_config_sub=true
6
- config_sub_path= build-aux/config.sub
6
+ config_sub_paths=( " build-aux/config.sub" )
7
7
configopts=(" --with-libgpg-error-prefix=${SERENITY_INSTALL_ROOT} /usr/local" )
8
8
depends=(" libgpg-error" )
9
9
files=" https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-${version} .tar.bz2 libgcrypt-${version} .tar.bz2 ef14ae546b0084cd84259f61a55e07a38c3b53afc0f546bffcef2f01baffe9de"
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ port=libgd
3
3
version=2.3.3
4
4
useconfigure=true
5
5
use_fresh_config_sub=true
6
- config_sub_path= config/config.sub
6
+ config_sub_paths=( " config/config.sub" )
7
7
files=" https://github.com/libgd/libgd/releases/download/gd-${version} /libgd-${version} .tar.gz libgd-${version} .tar.gz dd3f1f0bb016edcc0b2d082e8229c822ad1d02223511997c80461481759b1ed2"
8
8
auth_type=sha256
9
9
depends=(" libpng" )
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ port=libgpg-error
3
3
version=1.44
4
4
useconfigure=true
5
5
use_fresh_config_sub=true
6
- config_sub_path= build-aux/config.sub
6
+ config_sub_paths=( " build-aux/config.sub" )
7
7
depends=(" gettext" )
8
8
configopts=(" --disable-tests" " --disable-threads" )
9
9
files=" https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-${version} .tar.bz2 libgpg-error-${version} .tar.bz2 8e3d2da7a8b9a104dd8e9212ebe8e0daf86aa838cc1314ba6bc4de8f2d8a1ff9"
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ port=libksba
3
3
version=1.5.1
4
4
useconfigure=true
5
5
use_fresh_config_sub=true
6
- config_sub_path= build-aux/config.sub
6
+ config_sub_paths=( " build-aux/config.sub" )
7
7
depends=(" libgpg-error" )
8
8
files=" https://gnupg.org/ftp/gcrypt/libksba/libksba-${version} .tar.bz2 libksba-${version} .tar.bz2 b0f4c65e4e447d9a2349f6b8c0e77a28be9531e4548ba02c545d1f46dc7bf921"
9
9
auth_type=sha256
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ port=libmpeg2
3
3
version=0.5.1
4
4
useconfigure=true
5
5
use_fresh_config_sub=true
6
- config_sub_path= .auto/config.sub
6
+ config_sub_paths=( " .auto/config.sub" )
7
7
configopts=(" --disable-sdl" )
8
8
files=" https://libmpeg2.sourceforge.io/files/libmpeg2-${version} .tar.gz libmpeg2-${version} .tar.gz dee22e893cb5fc2b2b6ebd60b88478ab8556cb3b93f9a0d7ce8f3b61851871d4"
9
9
auth_type=sha256
Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ version=1.29.3
4
4
useconfigure=true
5
5
workdir=mpg123-${version}
6
6
use_fresh_config_sub=true
7
- config_sub_path= build/config.sub
7
+ config_sub_paths=( " build/config.sub" )
8
8
files=" https://download.sourceforge.net/project/mpg123/mpg123/${version} /mpg123-${version} .tar.bz2 mpg123-${version} .tar.bz2
9
9
https://download.sourceforge.net/project/mpg123/mpg123/${version} /mpg123-${version} .tar.bz2.sig mpg123-${version} .tar.bz2.sig"
10
10
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ port=libsodium
3
3
version=1.0.18
4
4
useconfigure=true
5
5
use_fresh_config_sub=true
6
- config_sub_path= build-aux/config.sub
6
+ config_sub_paths=( " build-aux/config.sub" )
7
7
workdir=libsodium-${version}
8
8
files=" https://download.libsodium.org/libsodium/releases/libsodium-${version} .tar.gz libsodium-${version} .tar.gz 6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1"
9
9
auth_type=sha256
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ port=libtool
3
3
version=2.4.7
4
4
useconfigure=true
5
5
use_fresh_config_sub=true
6
- config_sub_path= build-aux/config.sub
6
+ config_sub_paths=( " build-aux/config.sub" )
7
7
depends=(" bash" " sed" )
8
8
files=" https://ftpmirror.gnu.org/gnu/libtool/libtool-${version} .tar.xz libtool-${version} .tar.xz
9
9
https://ftpmirror.gnu.org/gnu/libtool/libtool-${version} .tar.xz.sig libtool-${version} .tar.xz.sig
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ port=make
3
3
version=4.3
4
4
useconfigure=true
5
5
use_fresh_config_sub=true
6
- config_sub_path= build-aux/config.sub
6
+ config_sub_paths=( " build-aux/config.sub" )
7
7
files=" https://ftpmirror.gnu.org/gnu/make/make-${version} .tar.gz make-${version} .tar.gz
8
8
https://ftpmirror.gnu.org/gnu/make/make-${version} .tar.gz.sig make-${version} .tar.gz.sig
9
9
https://ftpmirror.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg"
Original file line number Diff line number Diff line change @@ -16,4 +16,4 @@ configopts=(
16
16
" --with-ncurses-libs=$SERENITY_BUILD_DIR /Root/usr/local/lib"
17
17
)
18
18
use_fresh_config_sub=true
19
- config_sub_path= config/config.sub
19
+ config_sub_paths=( " config/config.sub" )
Original file line number Diff line number Diff line change 3
3
version=1.2.1
4
4
useconfigure=true
5
5
use_fresh_config_sub=true
6
- config_sub_path= build-aux/config.sub
6
+ config_sub_paths=( " build-aux/config.sub" )
7
7
configopts=(" --target=${SERENITY_ARCH} -pc-serenity" " --with-sysroot=${SERENITY_INSTALL_ROOT} " )
8
8
files=" https://ftpmirror.gnu.org/gnu/mpc/mpc-${version} .tar.gz mpc-${version} .tar.gz
9
9
https://ftpmirror.gnu.org/gnu/mpc/mpc-${version} .tar.gz.sig mpc-${version} .tar.gz.sig
Original file line number Diff line number Diff line change @@ -5,5 +5,5 @@ files="https://www.nasm.us/pub/nasm/releasebuilds/${version}/nasm-${version}.tar
5
5
auth_type=sha256
6
6
useconfigure=true
7
7
use_fresh_config_sub=true
8
- config_sub_path= autoconf/helpers/config.sub
8
+ config_sub_paths=( " autoconf/helpers/config.sub" )
9
9
makeopts=()
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ port=npth
3
3
version=1.6
4
4
useconfigure=true
5
5
use_fresh_config_sub=true
6
- config_sub_path= build-aux/config.sub
6
+ config_sub_paths=( " build-aux/config.sub" )
7
7
files=" https://gnupg.org/ftp/gcrypt/npth/npth-${version} .tar.bz2 npth-${version} .tar.bz2 1393abd9adcf0762d34798dc34fdcf4d0d22a8410721e76f1e3afcd1daa4e2d1"
8
8
auth_type=sha256
9
9
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ port=ntbtls
3
3
version=0.2.0
4
4
useconfigure=true
5
5
use_fresh_config_sub=true
6
- config_sub_path= build-aux/config.sub
6
+ config_sub_paths=( " build-aux/config.sub" )
7
7
depends=(" libgpg-error" " libksba" " libgcrypt" " zlib" )
8
8
files=" https://gnupg.org/ftp/gcrypt/ntbtls/ntbtls-${version} .tar.bz2 ntbtls-${version} .tar.bz2 649fe74a311d13e43b16b26ebaa91665ddb632925b73902592eac3ed30519e17"
9
9
auth_type=sha256
Original file line number Diff line number Diff line change @@ -3,6 +3,6 @@ port=patch
3
3
version=2.7.6
4
4
useconfigure=true
5
5
use_fresh_config_sub=true
6
- config_sub_path= build-aux/config.sub
6
+ config_sub_paths=( " build-aux/config.sub" )
7
7
files=" https://ftp.gnu.org/gnu/patch/patch-${version} .tar.gz patch-${version} .tar.gz 8cf86e00ad3aaa6d26aca30640e86b0e3e1f395ed99f189b06d4c9f74bc58a4e"
8
8
auth_type=sha256
Original file line number Diff line number Diff line change 3
3
port=readline
4
4
version=8.1.2
5
5
useconfigure=true
6
- config_sub_path= support/config.sub
6
+ config_sub_paths=( " support/config.sub" )
7
7
use_fresh_config_sub=true
8
8
files=" https://ftpmirror.gnu.org/gnu/readline/readline-${version} .tar.gz readline-${version} .tar.gz 7589a2381a8419e68654a47623ce7dfcb756815c8fee726b98f90bf668af7bc6"
9
9
auth_type=sha256
Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ port=ruby
6
6
version=${RUBY_VERSION}
7
7
useconfigure=" true"
8
8
use_fresh_config_sub=true
9
- config_sub_path= tool/config.sub
9
+ config_sub_paths=( " tool/config.sub" )
10
10
files=" ${RUBY_ARCHIVE_URL} ${RUBY_ARCHIVE} ${RUBY_ARCHIVE_SHA256SUM}
11
11
https://cache.ruby-lang.org/pub/misc/logo/ruby-logo-kit.zip ruby-logo-kit.zip 7f0a980e09874d35d80b958949dc2460e683957de3d2494a1499aea9d9989055"
12
12
auth_type=" sha256"
Original file line number Diff line number Diff line change 3
3
version=4.8
4
4
useconfigure=" true"
5
5
use_fresh_config_sub=" true"
6
- config_sub_path= build-aux/config.sub
6
+ config_sub_paths=( " build-aux/config.sub" )
7
7
files=" https://ftpmirror.gnu.org/gnu/sed/sed-${version} .tar.gz sed-${version} .tar.gz
8
8
https://ftpmirror.gnu.org/gnu/sed/sed-${version} .tar.gz.sig sed-${version} .tar.gz.sig
9
9
https://ftpmirror.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg"
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ port=wget
3
3
version=1.21.3
4
4
useconfigure=" true"
5
5
use_fresh_config_sub=true
6
- config_sub_path= build-aux/config.sub
6
+ config_sub_paths=( " build-aux/config.sub" )
7
7
depends=(" openssl" )
8
8
files=" https://ftpmirror.gnu.org/gnu/wget/wget-${version} .tar.gz wget-${version} .tar.gz
9
9
https://ftpmirror.gnu.org/gnu/wget/wget-${version} .tar.gz.sig wget-${version} .tar.gz.sig
Original file line number Diff line number Diff line change 3
3
version=5.2.5
4
4
useconfigure=true
5
5
use_fresh_config_sub=true
6
- config_sub_path= build-aux/config.sub
6
+ config_sub_paths=( " build-aux/config.sub" )
7
7
files=" https://tukaani.org/xz/xz-${version} .tar.gz xz-${version} .tar.gz f6f4910fd033078738bd82bfba4f49219d03b17eb0794eb91efbae419f4aba10"
8
8
auth_type=sha256
9
9
depends=(" zlib" " libiconv" )
Original file line number Diff line number Diff line change @@ -5,5 +5,5 @@ files="https://www.tortall.net/projects/yasm/releases/yasm-${version}.tar.gz yas
5
5
auth_type=" sha256"
6
6
useconfigure=true
7
7
use_fresh_config_sub=true
8
- config_sub_path= config/config.sub
8
+ config_sub_paths=( " config/config.sub" )
9
9
makeopts=()
You can’t perform that action at this time.
0 commit comments