2
0
mirror of https://codeberg.org/kiss-community/repo synced 2024-07-02 14:02:27 +00:00

Stop using kiss within build scripts (#50)

* mesa: use pkg-config instead of kiss l

* gcc: use gcc -dumpversion instead of reading version from kiss database

* cmake: use command -v instead of kiss l
This commit is contained in:
illiliti 2022-03-28 12:35:47 +03:00 committed by GitHub
parent 99b2957370
commit 3dfa85bab9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 5 deletions

View File

@ -15,8 +15,7 @@ mkdir -p gcc-build
cd gcc-build
# Grab the system's GCC version.
IFS=. read -r gcc_version _ 2>/dev/null \
< "$KISS_ROOT/var/db/kiss/installed/gcc/version" || gcc_version=null
gcc_version=$(gcc -dumpversion) || gcc_version=null
# Skip the bootstrap process if we are able.
case $2 in "$gcc_version"*)

View File

@ -2,7 +2,7 @@
patch -p1 < cmake-no-execinfo.patch
if kiss l cmake; then
if command -v cmake >/dev/null; then
cmake -B build \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \

View File

@ -34,7 +34,7 @@ mv -f _ meson.build
# To prevent the need for users to fork the mesa package to add
# libglvnd support, the below code checks for its availability
# and enables it if present. ie: install glvnd, rebuild mesa.
! kiss l libglvnd >/dev/null 2>&1 || glvnd_enabled=true
pkg-config --exists libglvnd || glvnd_enabled=false
meson \
--prefix=/usr \
@ -48,7 +48,7 @@ meson \
-Degl=enabled \
-Dvalgrind=false \
-Dzstd=false \
-Dglvnd="${glvnd_enabled:-false}" \
-Dglvnd="${glvnd_enabled:-true}" \
. output
ninja -C output