Merge pull request #5799 from heitbaum/mesonc

Fixes to meson: unknown options are now always fatal
This commit is contained in:
CvH 2021-10-26 11:39:37 +02:00 committed by GitHub
commit 5e51e45405
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 15 deletions

View File

@ -15,7 +15,6 @@ PKG_BUILD_FLAGS="-sysroot"
PKG_MESON_OPTS_TARGET="-Dbenchmark=disabled \ PKG_MESON_OPTS_TARGET="-Dbenchmark=disabled \
-Dcairo=enabled \ -Dcairo=enabled \
-Ddocs=disabled \ -Ddocs=disabled \
-Dfontconfig=enabled \
-Dfreetype=enabled \ -Dfreetype=enabled \
-Dglib=enabled \ -Dglib=enabled \
-Dgobject=disabled \ -Dgobject=disabled \

View File

@ -11,16 +11,15 @@ PKG_URL="https://www.x.org/releases/individual/app/igt-gpu-tools-${PKG_VERSION}.
PKG_LONGDESC="Test suite and tools for DRM/KMS drivers" PKG_LONGDESC="Test suite and tools for DRM/KMS drivers"
PKG_TOOLCHAIN="meson" PKG_TOOLCHAIN="meson"
PKG_MESON_OPTS_TARGET="-Dbuild_overlay=false \ PKG_MESON_OPTS_TARGET="-Dchamelium=disabled \
-Dbuild_man=false \ -Ddocs=disabled \
-Dwith_valgrind=false \ -Dlibdrm_drivers=auto \
-Dbuild_audio=false \ -Dlibunwind=disabled \
-Dbuild_chamelium=false \ -Dman=disabled \
-Dbuild_docs=false \ -Doverlay=disabled \
-Dbuild_tests=true -Drunner=disabled \
-Dwith_libdrm=auto \ -Dtests=enabled \
-Dwith_libunwind=false \ -Dvalgrind=disabled"
-Dbuild_runner=false"
pre_configure_target() { pre_configure_target() {
# xorg-intel-gpu-tools does not build with NDEBUG (requires assert for tests) # xorg-intel-gpu-tools does not build with NDEBUG (requires assert for tests)

View File

@ -14,13 +14,11 @@ PKG_LONGDESC="A library which includes support routines for C such as lists, tre
PKG_TOOLCHAIN="meson" PKG_TOOLCHAIN="meson"
PKG_MESON_OPTS_HOST="-Ddefault_library=static \ PKG_MESON_OPTS_HOST="-Ddefault_library=static \
-Dinternal_pcre=true \
-Dinstalled_tests=false \ -Dinstalled_tests=false \
-Dlibmount=disabled \ -Dlibmount=disabled \
-Dtests=false" -Dtests=false"
PKG_MESON_OPTS_TARGET="-Ddefault_library=shared \ PKG_MESON_OPTS_TARGET="-Ddefault_library=shared \
-Dinternal_pcre=false \
-Dinstalled_tests=false \ -Dinstalled_tests=false \
-Dselinux=disabled \ -Dselinux=disabled \
-Dfam=false \ -Dfam=false \

View File

@ -15,7 +15,6 @@ PKG_TOOLCHAIN="meson"
PKG_MESON_OPTS_TARGET="-Dbenchmark=disabled \ PKG_MESON_OPTS_TARGET="-Dbenchmark=disabled \
-Dcairo=enabled \ -Dcairo=enabled \
-Ddocs=disabled \ -Ddocs=disabled \
-Dfontconfig=enabled \
-Dfreetype=enabled \ -Dfreetype=enabled \
-Dglib=enabled \ -Dglib=enabled \
-Dgobject=disabled \ -Dgobject=disabled \

View File

@ -21,7 +21,7 @@ else
DISPLAYSERVER_LIBVA="-Dwith_x11=no -Dwith_wayland=no" DISPLAYSERVER_LIBVA="-Dwith_x11=no -Dwith_wayland=no"
fi fi
PKG_MESON_OPTS_TARGET="-Denable_hybrid_code=false \ PKG_MESON_OPTS_TARGET="-Denable_hybrid_codec=false \
-Denable_tests=false \ -Denable_tests=false \
${DISPLAYSERVER_LIBVA}" ${DISPLAYSERVER_LIBVA}"