Backport autotools/meson_configure mechanism from jinix

vlang · Jan 1, 2024 · cc92987 · cc92987
1 parent 196d025
commit cc92987
Show file tree

Hide file tree

Showing 84 changed files with 162 additions and 505 deletions.
diff --git a/build-support/cross_file.txt b/build-support/cross_file.txt
@@ -2,9 +2,10 @@
 c = 'x86_64-vinix-gcc'
 cpp = 'x86_64-vinix-g++'
 ar = 'x86_64-vinix-ar'
+nm = 'x86_64-vinix-nm'
 strip = 'x86_64-vinix-strip'
 pkg-config = 'x86_64-vinix-pkg-config'
-# sed adds binaries here.
+llvm-config = '/base_dir/build-support/cross-llvm-config'
 
 [host_machine]
 system = 'vinix'

diff --git a/jinx-config b/jinx-config
@@ -21,13 +21,48 @@ post_package_strip() {
     done
 }
 
+autotools_configure() {
+    if [ -z "${configure_script_path}" ]; then
+        configure_script_path="${source_dir}/configure"
+    fi
+
+    ${configure_script_path} \
+        --host=${OS_TRIPLET} \
+        --with-sysroot=${sysroot_dir} \
+        --prefix=${prefix} \
+        --sysconfdir=/etc \
+        --localstatedir=/var \
+        --bindir=${prefix}/bin \
+        --sbindir=${prefix}/bin \
+        --libdir=${prefix}/lib \
+        --disable-static \
+        --enable-shared \
+        "$@"
+}
+
 autotools_recursive_regen() {
     for f in $(find . -name configure.ac); do
         echo "* autotools regen in '$(dirname $f)'..."
         ( cd "$(dirname "$f")" && autoreconf -fvi "$@" )
     done
 }
 
+meson_configure() {
+    if [ -z "${meson_source_dir}" ]; then
+        meson_source_dir="${source_dir}"
+    fi
+
+    meson setup "${meson_source_dir}" \
+        --cross-file "${base_dir}/build-support/cross_file.txt" \
+        --prefix=${prefix} \
+        --sysconfdir=/etc \
+        --libdir=lib \
+        --sbindir=bin \
+        --buildtype=release \
+        -Ddefault_library=shared \
+        "$@"
+}
+
 if [ "$in_container" = true ]; then
     export VMODULES="/tmp/.vmodules"
     mkdir -p "${VMODULES}"/cache

diff --git a/recipes/bash b/recipes/bash
@@ -6,13 +6,8 @@ hostdeps="gcc autoconf automake libtool pkg-config"
 deps="core-libs ncurses readline"
 
 build() {
-    ${source_dir}/configure \
-        --host=${OS_TRIPLET} \
-        --prefix=${prefix} \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --without-bash-malloc  \
-        --disable-nls \
+    autotools_configure \
+        --without-bash-malloc \
         --with-installed-readline="${sysroot}"/usr/lib
 
     make -j${parallelism}

diff --git a/recipes/binutils b/recipes/binutils
@@ -6,19 +6,13 @@ deps="core-libs zlib gmp"
 imagedeps="gcc"
 
 build() {
-    ${source_dir}/configure           \
-        --host=${OS_TRIPLET}           \
-        --prefix=${prefix}            \
-        --target=${OS_TRIPLET}         \
-        --with-sysroot=${sysroot_dir} \
-        --disable-nls                 \
-        --disable-werror              \
+    autotools_configure \
+        --target=${OS_TRIPLET} \
+        --disable-werror \
         --disable-dependency-tracking \
         --enable-colored-disassembly \
-        --with-system-zlib            \
-        --with-gmp=${sysroot_dir}/usr \
-        --enable-shared               \
-        --enable-host-shared
+        --with-system-zlib \
+        --with-gmp=${sysroot_dir}/usr
 
         SFRAME_LIB_PATH="-L$(pwd -P)/libsframe/.libs" \
     make -j${parallelism} all

diff --git a/recipes/coreutils b/recipes/coreutils
@@ -8,13 +8,9 @@ imagedeps="gcc gperf"
 build() {
     cp -rp "${source_dir}"/. ./
 
+        configure_script_path=./configure \
         CFLAGS="-DSLOW_BUT_NO_HACKS $CFLAGS" \
-    ./configure    \
-        --host=${OS_TRIPLET}    \
-        --prefix=${prefix}     \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --disable-nls
+    autotools_configure
 
     make -j${parallelism}
 }

diff --git a/recipes/cxxshim b/recipes/cxxshim
@@ -4,12 +4,9 @@ revision=1
 imagedeps="meson ninja git base-devel"
 
 build() {
-    meson setup \
-        --prefix=${prefix} \
-        --libdir=lib \
+    meson_configure \
         --includedir=share/cxxshim/include \
-        -Dinstall_headers=true \
-        ${source_dir}
+        -Dinstall_headers=true
 
     ninja -j${parallelism}
 }

diff --git a/recipes/diffutils b/recipes/diffutils
@@ -7,12 +7,8 @@ deps="core-libs"
 build() {
     cp -rp "${source_dir}"/. ./
 
-    ./configure \
-        --host=${OS_TRIPLET} \
-        --prefix=${prefix} \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --disable-nls
+        configure_script_path=./configure
+    autotools_configure
 
     make -j${parallelism}
 }

diff --git a/recipes/findutils b/recipes/findutils
@@ -8,12 +8,8 @@ imagedeps="python"
 build() {
     cp -rp "${source_dir}"/. ./
 
-    ./configure \
-        --host=${OS_TRIPLET} \
-        --prefix=${prefix} \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --disable-nls \
+        configure_script_path=./configure \
+    autotools_configure \
         --without-selinux
 
     make -j${parallelism}

diff --git a/recipes/fontconfig b/recipes/fontconfig
@@ -6,14 +6,7 @@ deps="core-libs freetype libexpat libxml"
 imagedeps="python gperf"
 
 build() {
-    ${source_dir}/configure \
-        --host=${OS_TRIPLET} \
-        --prefix=${prefix} \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --disable-static \
-        --disable-docs \
-        --disable-nls \
+    autotools_configure \
         --enable-libxml2
 
     make -j${parallelism}

diff --git a/recipes/freetype b/recipes/freetype
@@ -6,12 +6,7 @@ deps="core-libs bzip2 libpng zlib"
 imagedeps="gcc"
 
 build() {
-    ${source_dir}/configure \
-        --host=${OS_TRIPLET} \
-        --prefix=${prefix} \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --disable-static \
+    autotools_configure \
         --with-harfbuzz=no
 
     make -j${parallelism}

diff --git a/recipes/frigg b/recipes/frigg
@@ -4,13 +4,10 @@ revision=1
 imagedeps="meson ninja git base-devel"
 
 build() {
-    meson setup \
-        --prefix=${prefix} \
-        --libdir=lib \
+    meson_configure \
         --includedir=share/frigg/include \
         --buildtype=debugoptimized \
-        -Dbuild_tests=disabled \
-        ${source_dir}
+        -Dbuild_tests=disabled
 
     ninja -j${parallelism}
 }

diff --git a/recipes/gawk b/recipes/gawk
@@ -7,12 +7,8 @@ deps="core-libs mpfr gmp readline"
 build() {
     cp -rp "${source_dir}"/. ./
 
-    ./configure \
-        --host=${OS_TRIPLET} \
-        --prefix=${prefix} \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --disable-nls
+        configure_script_path=./configure \
+    autotools_configure
 
     make -j${parallelism}
 }

diff --git a/recipes/gcc b/recipes/gcc
@@ -8,20 +8,14 @@ imagedeps="gcc"
 build() {
         CXXFLAGS_FOR_TARGET="$CFLAGS" \
         CFLAGS_FOR_TARGET="$CFLAGS" \
-    ${source_dir}/configure                 \
-        --host=${OS_TRIPLET}                 \
-        --prefix=${prefix}                  \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --target=${OS_TRIPLET}               \
-        --with-sysroot=/                    \
+    autotools_configure \
+        --target=${OS_TRIPLET} \
+        --with-sysroot=/ \
         --with-build-sysroot=${sysroot_dir} \
-        --enable-languages=c,c++,lto            \
-        --enable-initfini-array             \
-        --disable-multilib                  \
-        --disable-nls                       \
-        --with-system-zlib                  \
-        --enable-shared                     \
+        --enable-languages=c,c++,lto \
+        --enable-initfini-array \
+        --disable-multilib \
+        --with-system-zlib \
         --enable-host-shared
 
     make -j${parallelism} all-gcc

diff --git a/recipes/gmp b/recipes/gmp
@@ -6,14 +6,8 @@ hostdeps="gcc autoconf automake libtool pkg-config"
 deps="core-libs"
 
 build() {
-    ${source_dir}/configure           \
-        --host=${OS_TRIPLET}           \
-        --prefix=${prefix}            \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --enable-cxx                  \
-        --disable-static              \
-        --with-sysroot=${sysroot_dir}
+    autotools_configure \
+        --enable-cxx
 
     make -j${parallelism}
 }

diff --git a/recipes/grep b/recipes/grep
@@ -8,12 +8,8 @@ imagedeps="gperf"
 build() {
     cp -rp "${source_dir}"/. ./
 
-    ./configure \
-        --host=${OS_TRIPLET} \
-        --prefix=${prefix} \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --disable-nls
+        configure_script_path=./configure \
+    autotools_configure
 
     make -j${parallelism}
 }

diff --git a/recipes/gzip b/recipes/gzip
@@ -7,12 +7,8 @@ deps="core-libs"
 build() {
     cp -rp "${source_dir}"/. ./
 
-    ./configure \
-        --host=${OS_TRIPLET} \
-        --prefix=${prefix} \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --disable-static
+        configure_script_path=./configure \
+    autotools_configure
 
     make -j${parallelism}
 }

diff --git a/recipes/less b/recipes/less
@@ -5,11 +5,7 @@ hostdeps="gcc autoconf automake libtool pkg-config"
 deps="core-libs ncurses"
 
 build() {
-    ${source_dir}/configure \
-        --host=${OS_TRIPLET} \
-        --prefix="${prefix}" \
-        --sysconfdir=/etc \
-        --localstatedir=/var
+    autotools_configure
 
     make -j${parallelism}
 }

diff --git a/recipes/libepoxy b/recipes/libepoxy
@@ -6,13 +6,9 @@ deps="core-libs mesa xorg-proto libx11"
 imagedeps="meson ninja"
 
 build() {
-    meson setup \
-        --cross-file ${base_dir}/build-support/cross_file.txt \
-        --prefix=${prefix} \
-        --buildtype=release \
+    meson_configure \
         -Degl=no \
-        -Dtests=false \
-        ${source_dir}
+        -Dtests=false
 
     ninja -j${parallelism}
 }

diff --git a/recipes/libexpat b/recipes/libexpat
@@ -5,12 +5,7 @@ hostdeps="gcc autoconf automake libtool pkg-config"
 deps="core-libs"
 
 build() {
-    ${source_dir}/configure     \
-        --host=${OS_TRIPLET}           \
-        --prefix=${prefix}            \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --disable-static              \
+    autotools_configure \
         --without-xmlwf
 
     make -j${parallelism}

diff --git a/recipes/libffi b/recipes/libffi
@@ -5,12 +5,7 @@ hostdeps="gcc autoconf automake libtool pkg-config"
 deps="core-libs"
 
 build() {
-    ${source_dir}/configure           \
-        --host=${OS_TRIPLET}           \
-        --prefix=${prefix}            \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --disable-static
+    autotools_configure
 
     make -j${parallelism}
 }

diff --git a/recipes/libfontenc b/recipes/libfontenc
@@ -5,12 +5,7 @@ hostdeps="gcc autoconf automake libtool pkg-config"
 deps="core-libs xorg-proto zlib"
 
 build() {
-    ${source_dir}/configure           \
-        --host=${OS_TRIPLET}           \
-        --prefix=${prefix}            \
-        --sysconfdir=/etc             \
-        --localstatedir=/var          \
-        --disable-static
+    autotools_configure
 
     make -j${parallelism}
 }

diff --git a/recipes/libice b/recipes/libice
@@ -5,12 +5,7 @@ hostdeps="gcc autoconf automake libtool pkg-config"
 deps="core-libs xorg-util-macros xorg-proto libx11 libxtrans"
 
 build() {
-    ${source_dir}/configure           \
-        --host=${OS_TRIPLET}           \
-        --prefix=${prefix}            \
-        --sysconfdir=/etc             \
-        --localstatedir=/var          \
-        --disable-static
+    autotools_configure
 
     make -j${parallelism}
 }

diff --git a/recipes/libiconv b/recipes/libiconv
@@ -6,14 +6,7 @@ deps="mlibc libgcc libstdc++"
 imagedeps="binutils"
 
 build() {
-    ${source_dir}/configure           \
-        --host=${OS_TRIPLET}           \
-        --prefix=${prefix}            \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --disable-static              \
-        --enable-shared               \
-        --disable-nls
+    autotools_configure
 
     make -j${parallelism}
 }