Use Cmake LIB_SUFFIX=32

2 files changed, 6 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a40d68be99f2..1d5d3ecb3c56 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = lib32-chromaprint
 	pkgdesc = Library for extracting fingerprints from any audio source (32-bit)
 	pkgver = 1.5.0
-	pkgrel = 4
+	pkgrel = 5
 	url = https://acoustid.org/chromaprint
 	arch = x86_64
 	license = LGPL2.1
diff --git a/PKGBUILD b/PKGBUILD
index aaa5b784b425..e2db6f78c4cf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,9 @@
 # Contributor: orumin <dev@orum.in>
 
 _basename=chromaprint
-pkgname="lib32-$_basename"
+pkgname=lib32-chromaprint
 pkgver=1.5.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Library for extracting fingerprints from any audio source (32-bit)"
 url="https://acoustid.org/chromaprint"
 arch=('x86_64')
@@ -23,18 +23,20 @@ prepare() {
     cd "${_basename}-${pkgver}"
 
     patch -Np1 -i ../fix_build_32bit.patch
+
     rm -v cmake/modules/FindGTest.cmake
 }
 
 build() {
     export CC='gcc -m32'
     export CXX='g++ -m32'
-    export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
+    export PKG_CONFIG='/usr/bin/i686-pc-linux-gnu-pkg-config'
 
     cd "${_basename}-${pkgver}"
 
     cmake -S . -B build \
         -DCMAKE_INSTALL_PREFIX=/usr \
+        -DLIB_SUFFIX=32 \
         -DCMAKE_BUILD_TYPE='None' \
         -DBUILD_TESTS=ON \
         -DGTEST_SOURCE_DIR=/usr/src/googletest/ \
@@ -58,8 +60,5 @@ package() {
 
     cd "$pkgdir"/usr
 
-    sed -e "s|/usr/lib|/usr/lib32|" -i lib/pkgconfig/libchromaprint.pc
-
     rm -r include
-    mv lib lib32
 }