mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2024-08-17 09:20:28 +03:00
Ports: Allow selecting multiple config_{sub,guess}_path
s
Some ports may have more than one `config.sub` that is in use (vendored dependencies, etc.). Instead of fiddling about with space-delimited strings, let's just make that setting into an array right away.
This commit is contained in:
parent
ff90647958
commit
f81e47eea8
Notes:
sideshowbarker
2024-07-17 10:41:08 +09:00
Author: https://github.com/timschumi Commit: https://github.com/SerenityOS/serenity/commit/f81e47eea8 Pull-request: https://github.com/SerenityOS/serenity/pull/14099 Reviewed-by: https://github.com/linusg
@ -65,8 +65,8 @@ installopts=()
|
||||
configscript=configure
|
||||
configopts=()
|
||||
useconfigure=false
|
||||
config_sub_path=config.sub
|
||||
config_guess_path=config.guess
|
||||
config_sub_paths=("config.sub")
|
||||
config_guess_paths=("config.guess")
|
||||
use_fresh_config_sub=false
|
||||
use_fresh_config_guess=false
|
||||
depends=()
|
||||
@ -141,11 +141,15 @@ get_new_config_guess() {
|
||||
}
|
||||
|
||||
ensure_new_config_sub() {
|
||||
get_new_config_sub "$config_sub_path"
|
||||
for path in "${config_sub_paths[@]}"; do
|
||||
get_new_config_sub "${path}"
|
||||
done
|
||||
}
|
||||
|
||||
ensure_new_config_guess() {
|
||||
get_new_config_guess "$config_guess_path"
|
||||
for path in "${config_guess_paths[@]}"; do
|
||||
get_new_config_guess "${path}"
|
||||
done
|
||||
}
|
||||
|
||||
ensure_build() {
|
||||
|
@ -177,10 +177,10 @@ if that's undesirable.
|
||||
Boolean option (`false` by default), will replace the `config.sub` pointed to by
|
||||
`config_sub_path` as part of the patching process if set to true.
|
||||
|
||||
#### `config_sub_path`
|
||||
#### `config_sub_paths`
|
||||
|
||||
Path to the `config.sub` file used by autoconf, starting at `$workdir`.
|
||||
This is set to `config.sub` by default.
|
||||
Paths to the `config.sub` files used by autoconf, starting at `$workdir`.
|
||||
This is set to `(config.sub)` by default.
|
||||
|
||||
#### `configscript`
|
||||
|
||||
|
@ -3,7 +3,7 @@ port=SDL2_mixer
|
||||
version=2.0.4
|
||||
useconfigure=true
|
||||
use_fresh_config_sub=true
|
||||
config_sub_path=build-scripts/config.sub
|
||||
config_sub_paths=("build-scripts/config.sub")
|
||||
files="https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-${version}.tar.gz SDL2_mixer-${version}.tar.gz b4cf5a382c061cd75081cf246c2aa2f9df8db04bdda8dcdc6b6cca55bede2419"
|
||||
auth_type=sha256
|
||||
depends=("libmodplug" "libmpg123" "libvorbis" "SDL2")
|
||||
|
@ -4,8 +4,8 @@ version=5.1.16
|
||||
useconfigure=true
|
||||
use_fresh_config_sub=true
|
||||
use_fresh_config_guess=true
|
||||
config_sub_path=support/config.sub
|
||||
config_guess_path=support/config.guess
|
||||
config_sub_paths=("support/config.sub")
|
||||
config_guess_paths=("support/config.guess")
|
||||
configopts=("--disable-nls" "--without-bash-malloc")
|
||||
files="https://ftpmirror.gnu.org/gnu/bash/bash-${version}.tar.gz bash-${version}.tar.gz 5bac17218d3911834520dad13cd1f85ab944e1c09ae1aba55906be1f8192f558"
|
||||
auth_type="sha256"
|
||||
|
@ -3,7 +3,7 @@ port=coreutils
|
||||
version=9.1
|
||||
useconfigure="true"
|
||||
use_fresh_config_sub="true"
|
||||
config_sub_path=build-aux/config.sub
|
||||
config_sub_paths=("build-aux/config.sub")
|
||||
files="https://ftpmirror.gnu.org/gnu/coreutils/coreutils-${version}.tar.gz coreutils-${version}.tar.gz
|
||||
https://ftpmirror.gnu.org/gnu/coreutils/coreutils-${version}.tar.gz.sig coreutils-${version}.tar.gz.sig
|
||||
https://ftpmirror.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg"
|
||||
|
@ -5,5 +5,5 @@ files="https://ftpmirror.gnu.org/gnu/diffutils/diffutils-${version}.tar.xz diffu
|
||||
auth_type=sha256
|
||||
useconfigure=true
|
||||
use_fresh_config_sub=true
|
||||
config_sub_path=build-aux/config.sub
|
||||
config_sub_paths=("build-aux/config.sub")
|
||||
depends=("libiconv")
|
||||
|
@ -5,7 +5,7 @@ files="https://github.com/westes/flex/releases/download/v${version}/flex-${versi
|
||||
https://github.com/westes/flex/releases/download/v${version}/flex-${version}.tar.gz.sig flex-${version}.tar.gz.sig"
|
||||
useconfigure=true
|
||||
use_fresh_config_sub=true
|
||||
config_sub_path=build-aux/config.sub
|
||||
config_sub_paths=("build-aux/config.sub")
|
||||
configopts=("--disable-bootstrap")
|
||||
depends=("m4" "pcre2")
|
||||
auth_type="sig"
|
||||
|
@ -3,7 +3,7 @@ port=freeciv
|
||||
version=3.0.0-beta2
|
||||
useconfigure=true
|
||||
use_fresh_config_sub=true
|
||||
config_sub_path=bootstrap/config.sub
|
||||
config_sub_paths=("bootstrap/config.sub")
|
||||
configopts=("--enable-client=sdl2" "--enable-fcmp=no")
|
||||
files="http://files.freeciv.org/beta/freeciv-${version}.tar.xz freeciv-${version}.tar.xz 9f44dc28068b239c18bda68192ddb27622030880f8ab9c17f777eac28391269e"
|
||||
auth_type=sha256
|
||||
|
@ -3,7 +3,7 @@ port=freedink
|
||||
version=109.6
|
||||
useconfigure="true"
|
||||
use_fresh_config_sub="true"
|
||||
config_sub_path=autotools/config.sub
|
||||
config_sub_paths=("autotools/config.sub")
|
||||
depends=("SDL2" "SDL2_image" "SDL2_mixer" "SDL2_ttf" "SDL2_gfx" "gettext" "fontconfig" "glm")
|
||||
freedink_data="freedink-data-1.08.20190120"
|
||||
files="https://ftpmirror.gnu.org/gnu/freedink/freedink-${version}.tar.gz freedink-${version}.tar.gz
|
||||
|
@ -3,11 +3,11 @@ port=freetype
|
||||
version=2.12.0
|
||||
useconfigure=true
|
||||
use_fresh_config_sub=true
|
||||
config_sub_path=builds/unix/config.sub
|
||||
config_sub_paths=("builds/unix/config.sub")
|
||||
files="https://download.savannah.gnu.org/releases/freetype/freetype-${version}.tar.gz freetype-${version}.tar.gz 7940a46eeb0255baaa87c553d72778c4f8daa2b8888c8e2a05766a2a8686740c"
|
||||
auth_type=sha256
|
||||
configopts=("--with-brotli=no" "--with-bzip2=no" "--with-zlib=no" "--with-harfbuzz=no" "--with-png=no")
|
||||
config_sub_path="builds/unix/config.sub"
|
||||
config_sub_paths=("builds/unix/config.sub")
|
||||
|
||||
install() {
|
||||
run make DESTDIR=${SERENITY_INSTALL_ROOT} "${installopts[@]}" install
|
||||
|
@ -3,7 +3,7 @@ port=gnucobol
|
||||
version=3.1.2
|
||||
useconfigure="true"
|
||||
use_fresh_config_sub="true"
|
||||
config_sub_path=build_aux/config.sub
|
||||
config_sub_paths=("build_aux/config.sub")
|
||||
depends=("gmp" "gcc" "bash" "ncurses")
|
||||
files="https://ftpmirror.gnu.org/gnu/gnucobol/gnucobol-${version}.tar.bz2 gnucobol-${version}.tar.bz2
|
||||
https://ftpmirror.gnu.org/gnu/gnucobol/gnucobol-${version}.tar.bz2.sig gnucobol-${version}.tar.bz2.sig
|
||||
|
@ -3,7 +3,7 @@ port=gnupg
|
||||
version=2.3.0
|
||||
useconfigure=true
|
||||
use_fresh_config_sub=true
|
||||
config_sub_path=build-aux/config.sub
|
||||
config_sub_paths=("build-aux/config.sub")
|
||||
configopts=("--with-libgpg-error-prefix=${SERENITY_INSTALL_ROOT}/usr/local"
|
||||
"--with-libgcrypt-prefix=${SERENITY_INSTALL_ROOT}/usr/local"
|
||||
"--with-libassuan-prefix=${SERENITY_INSTALL_ROOT}/usr/local"
|
||||
|
@ -7,7 +7,7 @@ auth_type=sha256
|
||||
|
||||
useconfigure=true
|
||||
use_fresh_config_sub=true
|
||||
config_sub_path="build-aux/config.sub"
|
||||
config_sub_paths=("build-aux/config.sub")
|
||||
configopts=("--disable-lto" "--disable-jit")
|
||||
pre_configure() {
|
||||
run autoreconf
|
||||
|
@ -6,7 +6,7 @@ https://ftpmirror.gnu.org/gnu/indent/indent-${version}.tar.gz.sig indent-${versi
|
||||
https://ftpmirror.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg"
|
||||
useconfigure=true
|
||||
use_fresh_config_sub=true
|
||||
config_sub_path=config/config.sub
|
||||
config_sub_paths=("config/config.sub")
|
||||
auth_type="sig"
|
||||
auth_opts=("--keyring" "./gnu-keyring.gpg" "indent-${version}.tar.gz.sig")
|
||||
|
||||
|
@ -3,7 +3,7 @@ port=libarchive
|
||||
version=3.6.1
|
||||
useconfigure=true
|
||||
use_fresh_config_sub=true
|
||||
config_sub_path=build/autoconf/config.sub
|
||||
config_sub_paths=("build/autoconf/config.sub")
|
||||
configopts=("--without-xml2")
|
||||
files="https://libarchive.org/downloads/libarchive-${version}.tar.gz libarchive-${version}.tar.gz
|
||||
https://libarchive.org/downloads/libarchive-${version}.tar.gz.asc libarchive-${version}.tar.gz.asc"
|
||||
|
@ -3,7 +3,7 @@ port=libassuan
|
||||
version=2.5.5
|
||||
useconfigure=true
|
||||
use_fresh_config_sub=true
|
||||
config_sub_path=build-aux/config.sub
|
||||
config_sub_paths=("build-aux/config.sub")
|
||||
depends=("libgpg-error")
|
||||
files="https://gnupg.org/ftp/gcrypt/libassuan/libassuan-${version}.tar.bz2 libassuan-${version}.tar.bz2 8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4"
|
||||
auth_type=sha256
|
||||
|
@ -3,7 +3,7 @@ port=libexpat
|
||||
version=2.4.8
|
||||
useconfigure=true
|
||||
use_fresh_config_sub=true
|
||||
config_sub_path=conftools/config.sub
|
||||
config_sub_paths=("conftools/config.sub")
|
||||
files="https://github.com/libexpat/libexpat/releases/download/R_${version//./_}/expat-${version}.tar.xz expat-${version}.tar.xz
|
||||
https://github.com/libexpat/libexpat/releases/download/R_${version//./_}/expat-${version}.tar.xz.asc expat-${version}.tar.xz.asc"
|
||||
workdir=expat-${version}
|
||||
|
@ -3,7 +3,7 @@ port=libgcrypt
|
||||
version=1.10.1
|
||||
useconfigure=true
|
||||
use_fresh_config_sub=true
|
||||
config_sub_path=build-aux/config.sub
|
||||
config_sub_paths=("build-aux/config.sub")
|
||||
configopts=("--with-libgpg-error-prefix=${SERENITY_INSTALL_ROOT}/usr/local")
|
||||
depends=("libgpg-error")
|
||||
files="https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-${version}.tar.bz2 libgcrypt-${version}.tar.bz2 ef14ae546b0084cd84259f61a55e07a38c3b53afc0f546bffcef2f01baffe9de"
|
||||
|
@ -3,7 +3,7 @@ port=libgd
|
||||
version=2.3.3
|
||||
useconfigure=true
|
||||
use_fresh_config_sub=true
|
||||
config_sub_path=config/config.sub
|
||||
config_sub_paths=("config/config.sub")
|
||||
files="https://github.com/libgd/libgd/releases/download/gd-${version}/libgd-${version}.tar.gz libgd-${version}.tar.gz dd3f1f0bb016edcc0b2d082e8229c822ad1d02223511997c80461481759b1ed2"
|
||||
auth_type=sha256
|
||||
depends=("libpng")
|
||||
|
@ -3,7 +3,7 @@ port=libgpg-error
|
||||
version=1.44
|
||||
useconfigure=true
|
||||
use_fresh_config_sub=true
|
||||
config_sub_path=build-aux/config.sub
|
||||
config_sub_paths=("build-aux/config.sub")
|
||||
depends=("gettext")
|
||||
configopts=("--disable-tests" "--disable-threads")
|
||||
files="https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-${version}.tar.bz2 libgpg-error-${version}.tar.bz2 8e3d2da7a8b9a104dd8e9212ebe8e0daf86aa838cc1314ba6bc4de8f2d8a1ff9"
|
||||
|
@ -3,7 +3,7 @@ port=libksba
|
||||
version=1.5.1
|
||||
useconfigure=true
|
||||
use_fresh_config_sub=true
|
||||
config_sub_path=build-aux/config.sub
|
||||
config_sub_paths=("build-aux/config.sub")
|
||||
depends=("libgpg-error")
|
||||
files="https://gnupg.org/ftp/gcrypt/libksba/libksba-${version}.tar.bz2 libksba-${version}.tar.bz2 b0f4c65e4e447d9a2349f6b8c0e77a28be9531e4548ba02c545d1f46dc7bf921"
|
||||
auth_type=sha256
|
||||
|
@ -3,7 +3,7 @@ port=libmpeg2
|
||||
version=0.5.1
|
||||
useconfigure=true
|
||||
use_fresh_config_sub=true
|
||||
config_sub_path=.auto/config.sub
|
||||
config_sub_paths=(".auto/config.sub")
|
||||
configopts=("--disable-sdl")
|
||||
files="https://libmpeg2.sourceforge.io/files/libmpeg2-${version}.tar.gz libmpeg2-${version}.tar.gz dee22e893cb5fc2b2b6ebd60b88478ab8556cb3b93f9a0d7ce8f3b61851871d4"
|
||||
auth_type=sha256
|
||||
|
@ -4,7 +4,7 @@ version=1.29.3
|
||||
useconfigure=true
|
||||
workdir=mpg123-${version}
|
||||
use_fresh_config_sub=true
|
||||
config_sub_path=build/config.sub
|
||||
config_sub_paths=("build/config.sub")
|
||||
files="https://download.sourceforge.net/project/mpg123/mpg123/${version}/mpg123-${version}.tar.bz2 mpg123-${version}.tar.bz2
|
||||
https://download.sourceforge.net/project/mpg123/mpg123/${version}/mpg123-${version}.tar.bz2.sig mpg123-${version}.tar.bz2.sig"
|
||||
|
||||
|
@ -3,7 +3,7 @@ port=libsodium
|
||||
version=1.0.18
|
||||
useconfigure=true
|
||||
use_fresh_config_sub=true
|
||||
config_sub_path=build-aux/config.sub
|
||||
config_sub_paths=("build-aux/config.sub")
|
||||
workdir=libsodium-${version}
|
||||
files="https://download.libsodium.org/libsodium/releases/libsodium-${version}.tar.gz libsodium-${version}.tar.gz 6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1"
|
||||
auth_type=sha256
|
||||
|
@ -3,7 +3,7 @@ port=libtool
|
||||
version=2.4.7
|
||||
useconfigure=true
|
||||
use_fresh_config_sub=true
|
||||
config_sub_path=build-aux/config.sub
|
||||
config_sub_paths=("build-aux/config.sub")
|
||||
depends=("bash" "sed")
|
||||
files="https://ftpmirror.gnu.org/gnu/libtool/libtool-${version}.tar.xz libtool-${version}.tar.xz
|
||||
https://ftpmirror.gnu.org/gnu/libtool/libtool-${version}.tar.xz.sig libtool-${version}.tar.xz.sig
|
||||
|
@ -3,7 +3,7 @@ port=make
|
||||
version=4.3
|
||||
useconfigure=true
|
||||
use_fresh_config_sub=true
|
||||
config_sub_path=build-aux/config.sub
|
||||
config_sub_paths=("build-aux/config.sub")
|
||||
files="https://ftpmirror.gnu.org/gnu/make/make-${version}.tar.gz make-${version}.tar.gz
|
||||
https://ftpmirror.gnu.org/gnu/make/make-${version}.tar.gz.sig make-${version}.tar.gz.sig
|
||||
https://ftpmirror.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg"
|
||||
|
@ -16,4 +16,4 @@ configopts=(
|
||||
"--with-ncurses-libs=$SERENITY_BUILD_DIR/Root/usr/local/lib"
|
||||
)
|
||||
use_fresh_config_sub=true
|
||||
config_sub_path=config/config.sub
|
||||
config_sub_paths=("config/config.sub")
|
||||
|
@ -3,7 +3,7 @@ port=mpc
|
||||
version=1.2.1
|
||||
useconfigure=true
|
||||
use_fresh_config_sub=true
|
||||
config_sub_path=build-aux/config.sub
|
||||
config_sub_paths=("build-aux/config.sub")
|
||||
configopts=("--target=${SERENITY_ARCH}-pc-serenity" "--with-sysroot=${SERENITY_INSTALL_ROOT}")
|
||||
files="https://ftpmirror.gnu.org/gnu/mpc/mpc-${version}.tar.gz mpc-${version}.tar.gz
|
||||
https://ftpmirror.gnu.org/gnu/mpc/mpc-${version}.tar.gz.sig mpc-${version}.tar.gz.sig
|
||||
|
@ -5,5 +5,5 @@ files="https://www.nasm.us/pub/nasm/releasebuilds/${version}/nasm-${version}.tar
|
||||
auth_type=sha256
|
||||
useconfigure=true
|
||||
use_fresh_config_sub=true
|
||||
config_sub_path=autoconf/helpers/config.sub
|
||||
config_sub_paths=("autoconf/helpers/config.sub")
|
||||
makeopts=()
|
||||
|
@ -3,7 +3,7 @@ port=npth
|
||||
version=1.6
|
||||
useconfigure=true
|
||||
use_fresh_config_sub=true
|
||||
config_sub_path=build-aux/config.sub
|
||||
config_sub_paths=("build-aux/config.sub")
|
||||
files="https://gnupg.org/ftp/gcrypt/npth/npth-${version}.tar.bz2 npth-${version}.tar.bz2 1393abd9adcf0762d34798dc34fdcf4d0d22a8410721e76f1e3afcd1daa4e2d1"
|
||||
auth_type=sha256
|
||||
|
||||
|
@ -3,7 +3,7 @@ port=ntbtls
|
||||
version=0.2.0
|
||||
useconfigure=true
|
||||
use_fresh_config_sub=true
|
||||
config_sub_path=build-aux/config.sub
|
||||
config_sub_paths=("build-aux/config.sub")
|
||||
depends=("libgpg-error" "libksba" "libgcrypt" "zlib")
|
||||
files="https://gnupg.org/ftp/gcrypt/ntbtls/ntbtls-${version}.tar.bz2 ntbtls-${version}.tar.bz2 649fe74a311d13e43b16b26ebaa91665ddb632925b73902592eac3ed30519e17"
|
||||
auth_type=sha256
|
||||
|
@ -3,6 +3,6 @@ port=patch
|
||||
version=2.7.6
|
||||
useconfigure=true
|
||||
use_fresh_config_sub=true
|
||||
config_sub_path=build-aux/config.sub
|
||||
config_sub_paths=("build-aux/config.sub")
|
||||
files="https://ftp.gnu.org/gnu/patch/patch-${version}.tar.gz patch-${version}.tar.gz 8cf86e00ad3aaa6d26aca30640e86b0e3e1f395ed99f189b06d4c9f74bc58a4e"
|
||||
auth_type=sha256
|
||||
|
@ -3,7 +3,7 @@
|
||||
port=readline
|
||||
version=8.1.2
|
||||
useconfigure=true
|
||||
config_sub_path=support/config.sub
|
||||
config_sub_paths=("support/config.sub")
|
||||
use_fresh_config_sub=true
|
||||
files="https://ftpmirror.gnu.org/gnu/readline/readline-${version}.tar.gz readline-${version}.tar.gz 7589a2381a8419e68654a47623ce7dfcb756815c8fee726b98f90bf668af7bc6"
|
||||
auth_type=sha256
|
||||
|
@ -6,7 +6,7 @@ port=ruby
|
||||
version=${RUBY_VERSION}
|
||||
useconfigure="true"
|
||||
use_fresh_config_sub=true
|
||||
config_sub_path=tool/config.sub
|
||||
config_sub_paths=("tool/config.sub")
|
||||
files="${RUBY_ARCHIVE_URL} ${RUBY_ARCHIVE} ${RUBY_ARCHIVE_SHA256SUM}
|
||||
https://cache.ruby-lang.org/pub/misc/logo/ruby-logo-kit.zip ruby-logo-kit.zip 7f0a980e09874d35d80b958949dc2460e683957de3d2494a1499aea9d9989055"
|
||||
auth_type="sha256"
|
||||
|
@ -3,7 +3,7 @@ port=sed
|
||||
version=4.8
|
||||
useconfigure="true"
|
||||
use_fresh_config_sub="true"
|
||||
config_sub_path=build-aux/config.sub
|
||||
config_sub_paths=("build-aux/config.sub")
|
||||
files="https://ftpmirror.gnu.org/gnu/sed/sed-${version}.tar.gz sed-${version}.tar.gz
|
||||
https://ftpmirror.gnu.org/gnu/sed/sed-${version}.tar.gz.sig sed-${version}.tar.gz.sig
|
||||
https://ftpmirror.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg"
|
||||
|
@ -3,7 +3,7 @@ port=wget
|
||||
version=1.21.3
|
||||
useconfigure="true"
|
||||
use_fresh_config_sub=true
|
||||
config_sub_path=build-aux/config.sub
|
||||
config_sub_paths=("build-aux/config.sub")
|
||||
depends=("openssl")
|
||||
files="https://ftpmirror.gnu.org/gnu/wget/wget-${version}.tar.gz wget-${version}.tar.gz
|
||||
https://ftpmirror.gnu.org/gnu/wget/wget-${version}.tar.gz.sig wget-${version}.tar.gz.sig
|
||||
|
@ -3,7 +3,7 @@ port=xz
|
||||
version=5.2.5
|
||||
useconfigure=true
|
||||
use_fresh_config_sub=true
|
||||
config_sub_path=build-aux/config.sub
|
||||
config_sub_paths=("build-aux/config.sub")
|
||||
files="https://tukaani.org/xz/xz-${version}.tar.gz xz-${version}.tar.gz f6f4910fd033078738bd82bfba4f49219d03b17eb0794eb91efbae419f4aba10"
|
||||
auth_type=sha256
|
||||
depends=("zlib" "libiconv")
|
||||
|
@ -5,5 +5,5 @@ files="https://www.tortall.net/projects/yasm/releases/yasm-${version}.tar.gz yas
|
||||
auth_type="sha256"
|
||||
useconfigure=true
|
||||
use_fresh_config_sub=true
|
||||
config_sub_path=config/config.sub
|
||||
config_sub_paths=("config/config.sub")
|
||||
makeopts=()
|
||||
|
Loading…
Reference in New Issue
Block a user