diff --git a/multilib/p11-kit-32/.pkgfiles b/multilib/p11-kit-32/.pkgfiles index beb1d8246..ad3fc1593 100644 --- a/multilib/p11-kit-32/.pkgfiles +++ b/multilib/p11-kit-32/.pkgfiles @@ -1,16 +1,13 @@ -p11-kit-32-0.25.3-1 +p11-kit-32-0.25.3-2 drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib32/ -lrwxrwxrwx root/root usr/lib32/libp11-kit.so -> libp11-kit.so.0.3.1 +lrwxrwxrwx root/root usr/lib32/libp11-kit.so -> libp11-kit.so.0 lrwxrwxrwx root/root usr/lib32/libp11-kit.so.0 -> libp11-kit.so.0.3.1 -rwxr-xr-x root/root usr/lib32/libp11-kit.so.0.3.1 -lrwxrwxrwx root/root usr/lib32/p11-kit-proxy.so -> libp11-kit.so.0.3.1 +lrwxrwxrwx root/root usr/lib32/p11-kit-proxy.so -> libp11-kit.so.0 drwxr-xr-x root/root usr/lib32/p11-kit/ -rwxr-xr-x root/root usr/lib32/p11-kit/p11-kit-remote -rwxr-xr-x root/root usr/lib32/p11-kit/p11-kit-server -rwxr-xr-x root/root usr/lib32/p11-kit/trust-extract-compat -drwxr-xr-x root/root usr/lib32/pkcs11/ --rwxr-xr-x root/root usr/lib32/pkcs11/p11-kit-client.so --rwxr-xr-x root/root usr/lib32/pkcs11/p11-kit-trust.so drwxr-xr-x root/root usr/lib32/pkgconfig/ -rw-r--r-- root/root usr/lib32/pkgconfig/p11-kit-1.pc diff --git a/multilib/p11-kit-32/spkgbuild b/multilib/p11-kit-32/spkgbuild index 30b1302b9..1c22d03b8 100755 --- a/multilib/p11-kit-32/spkgbuild +++ b/multilib/p11-kit-32/spkgbuild @@ -3,24 +3,24 @@ name=p11-kit-32 version=0.25.3 -release=1 +release=2 source="https://github.com/p11-glue/p11-kit/releases/download/$version/p11-kit-$version.tar.xz" build() { - cd p11-kit-$version - export CC="gcc -m32" export CXX="g++ -m32" export PKG_CONFIG_LIBDIR="/usr/lib32/pkgconfig" - ./configure \ - --prefix=/usr \ + venom-meson p11-kit-$version build \ --libdir=/usr/lib32 \ --libexecdir=/usr/lib32 \ - --sysconfdir=/etc \ - --with-trust-paths=/etc/pki/anchors - make - make DESTDIR=$PWD/DESTDIR install - mkdir -p $PKG/usr/lib32 - cp -Rv DESTDIR/usr/lib32/* $PKG/usr/lib32 + -D trust_paths=/etc/pki/anchors \ + -D module_path=/usr/lib/pkcs11 \ + -D nls=false + meson compile -C build + DESTDIR=$PKG meson install -C build + + for d in etc usr/bin usr/include usr/lib usr/share; do + rm -r $PKG/$d + done }