mirror of
https://codeberg.org/kiss-community/repo
synced 2024-07-04 15: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:
parent
99b2957370
commit
3dfa85bab9
|
@ -15,8 +15,7 @@ mkdir -p gcc-build
|
||||||
cd gcc-build
|
cd gcc-build
|
||||||
|
|
||||||
# Grab the system's GCC version.
|
# Grab the system's GCC version.
|
||||||
IFS=. read -r gcc_version _ 2>/dev/null \
|
gcc_version=$(gcc -dumpversion) || gcc_version=null
|
||||||
< "$KISS_ROOT/var/db/kiss/installed/gcc/version" || gcc_version=null
|
|
||||||
|
|
||||||
# Skip the bootstrap process if we are able.
|
# Skip the bootstrap process if we are able.
|
||||||
case $2 in "$gcc_version"*)
|
case $2 in "$gcc_version"*)
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
patch -p1 < cmake-no-execinfo.patch
|
patch -p1 < cmake-no-execinfo.patch
|
||||||
|
|
||||||
if kiss l cmake; then
|
if command -v cmake >/dev/null; then
|
||||||
cmake -B build \
|
cmake -B build \
|
||||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||||
-DCMAKE_BUILD_TYPE=Release \
|
-DCMAKE_BUILD_TYPE=Release \
|
||||||
|
|
|
@ -34,7 +34,7 @@ mv -f _ meson.build
|
||||||
# To prevent the need for users to fork the mesa package to add
|
# To prevent the need for users to fork the mesa package to add
|
||||||
# libglvnd support, the below code checks for its availability
|
# libglvnd support, the below code checks for its availability
|
||||||
# and enables it if present. ie: install glvnd, rebuild mesa.
|
# 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 \
|
meson \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
|
@ -48,7 +48,7 @@ meson \
|
||||||
-Degl=enabled \
|
-Degl=enabled \
|
||||||
-Dvalgrind=false \
|
-Dvalgrind=false \
|
||||||
-Dzstd=false \
|
-Dzstd=false \
|
||||||
-Dglvnd="${glvnd_enabled:-false}" \
|
-Dglvnd="${glvnd_enabled:-true}" \
|
||||||
. output
|
. output
|
||||||
|
|
||||||
ninja -C output
|
ninja -C output
|
||||||
|
|
Loading…
Reference in New Issue
Block a user