diff --git a/lib32-llvm18/alr.sh b/lib32-llvm18/alr.sh index d1d795e..a014dfa 100644 --- a/lib32-llvm18/alr.sh +++ b/lib32-llvm18/alr.sh @@ -1,6 +1,6 @@ name='lib32-llvm18' version='18.1.8' -release='3' +release='4' desc='32-bit LLVM libraries for Mesa' desc_ru='32-битные библиотеки LLVM для Mesa' homepage='https://llvm.org/' @@ -42,12 +42,22 @@ build_deps_redos=("${build_deps[@]}") provides=( 'lib32-llvm18' 'llvm18-libs.i686' + 'llvm18-libs(x86-32)' 'llvm18-devel.i686' + 'llvm18-devel(x86-32)' + 'llvm-libs.i686' + 'llvm-libs(x86-32)' + 'llvm-static.i686' + 'llvm-static(x86-32)' ) conflicts=( - 'llvm-libs.i686 < 18.0' - 'llvm-static.i686 < 18.0' + 'llvm-libs.i686' + 'llvm-libs(x86-32)' + 'llvm-static.i686' + 'llvm-static(x86-32)' + 'llvm-devel.i686' + 'llvm-devel(x86-32)' ) _pkgver="${version}" diff --git a/lib32-lm_sensors/alr.sh b/lib32-lm_sensors/alr.sh index 4e29284..08a6b1b 100644 --- a/lib32-lm_sensors/alr.sh +++ b/lib32-lm_sensors/alr.sh @@ -1,6 +1,6 @@ name='lib32-lm_sensors' version='3.6.0' -release='2' +release='3' desc='32-bit hardware monitoring library' desc_ru='32-битная библиотека мониторинга оборудования' homepage='https://github.com/lm-sensors/lm-sensors' @@ -64,7 +64,7 @@ build() { MANDIR=/usr/share/man \ BUILD_STATIC_LIB=0 \ -j$(nproc) \ - lib/libsensors.so + user } package() { @@ -72,10 +72,16 @@ package() { echo "==> Installing lm_sensors (32-bit) libraries..." - # Install library - install -Dm755 lib/libsensors.so.${version} "$pkgdir/usr/lib/libsensors.so.${version}" - ln -sf libsensors.so.${version} "$pkgdir/usr/lib/libsensors.so.5" - ln -sf libsensors.so.${version} "$pkgdir/usr/lib/libsensors.so" + # Install library using make install (only libraries) + mkdir -p "$pkgdir/usr/lib" + make PREFIX="$pkgdir/usr" \ + LIBDIR="$pkgdir/usr/lib" \ + BUILD_STATIC_LIB=0 \ + install-lib + + # Remove pkg-config file (conflicts with 64-bit version) + rm -f "$pkgdir/usr/lib/pkgconfig/libsensors.pc" + rmdir "$pkgdir/usr/lib/pkgconfig" 2>/dev/null || true # Install license install -Dm644 COPYING "$pkgdir/usr/share/licenses/$name/COPYING"