lib32-mesa: использование заголовков LLVM 18

Добавлены пути к заголовкам LLVM 18 в CFLAGS/CXXFLAGS для совместимости API.
Исправлен путь создания llvm-config-i386.h на /usr/lib64/llvm18/include.
This commit is contained in:
2025-11-23 12:26:06 +03:00
parent b17525d5ff
commit 9b22b787ae

View File

@@ -1,6 +1,6 @@
name='lib32-mesa' name='lib32-mesa'
version='25.2.6' version='25.2.6'
release='12' release='13'
epoch='1' epoch='1'
desc='Open-source OpenGL and Vulkan drivers (32-bit) with AMD RDNA 4 support for gaming' desc='Open-source OpenGL and Vulkan drivers (32-bit) with AMD RDNA 4 support for gaming'
desc_ru='OpenGL и Vulkan драйверы (32-бит) с открытым исходным кодом с поддержкой AMD RDNA 4 для игр' desc_ru='OpenGL и Vulkan драйверы (32-бит) с открытым исходным кодом с поддержкой AMD RDNA 4 для игр'
@@ -148,9 +148,9 @@ prepare() {
echo "${version}-alr${epoch}.${release}" > VERSION echo "${version}-alr${epoch}.${release}" > VERSION
# Create llvm-config-i386.h for 32-bit LLVM support # Create llvm-config-i386.h for 32-bit LLVM support
echo "==> Creating llvm-config-i386.h for 32-bit LLVM..." echo "==> Creating llvm-config-i386.h for 32-bit LLVM 18..."
sudo cp /usr/include/llvm/Config/llvm-config-x86_64.h /usr/include/llvm/Config/llvm-config-i386.h sudo cp /usr/lib64/llvm18/include/llvm/Config/llvm-config-x86_64.h /usr/lib64/llvm18/include/llvm/Config/llvm-config-i386.h
sudo sed -i 's/x86_64-redsoft-linux-gnu/i686-redsoft-linux-gnu/g' /usr/include/llvm/Config/llvm-config-i386.h sudo sed -i 's/x86_64-redsoft-linux-gnu/i686-redsoft-linux-gnu/g' /usr/lib64/llvm18/include/llvm/Config/llvm-config-i386.h
# Create meson cross-file for 32-bit compilation # Create meson cross-file for 32-bit compilation
cat > "$srcdir/lib32-cross.ini" <<EOF cat > "$srcdir/lib32-cross.ini" <<EOF
@@ -184,9 +184,9 @@ build() {
export PKG_CONFIG_PATH="/usr/lib/pkgconfig:/usr/share/pkgconfig" export PKG_CONFIG_PATH="/usr/lib/pkgconfig:/usr/share/pkgconfig"
export LLVM_CONFIG="/usr/bin/llvm-config-18-32" export LLVM_CONFIG="/usr/bin/llvm-config-18-32"
# 32-bit CFLAGS/CXXFLAGS # 32-bit CFLAGS/CXXFLAGS with LLVM 18 headers
export CFLAGS="-m32 -O2 -g1" export CFLAGS="-m32 -O2 -g1 -I/usr/lib64/llvm18/include"
export CXXFLAGS="-m32 -O2 -g1" export CXXFLAGS="-m32 -O2 -g1 -I/usr/lib64/llvm18/include"
export LDFLAGS="-m32" export LDFLAGS="-m32"
echo "==> Configuring Mesa (32-bit) with Meson..." echo "==> Configuring Mesa (32-bit) with Meson..."