Date: Friday, December 30, 2022 @ 08:32:58
Author: svenstaro
Revision: 1372361
upgpkg: wasmer 3.1.0-2: Actually fix library paths (FS#76928)
Added:
wasmer/trunk/wasmer-fix-install-target.patch
Modified:
wasmer/trunk/PKGBUILD
---------------------------------+
PKGBUILD | 16 ++++++++++------
wasmer-fix-install-target.patch | 23 +++++++++++++++++++++++
2 files changed, 33 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-12-30 08:28:47 UTC (rev 1372360)
+++ PKGBUILD 2022-12-30 08:32:58 UTC (rev 1372361)
@@ -3,7 +3,7 @@
pkgname=wasmer
pkgver=3.1.0
-pkgrel=1
+pkgrel=2
pkgdesc="Universal Binaries Powered by WebAssembly"
arch=('x86_64')
url="https://github.com/wasmerio/wasmer";
@@ -11,10 +11,17 @@
depends=('gcc-libs' 'zlib' 'ncurses' 'libffi' 'libxkbcommon')
makedepends=('rust' 'cmake' 'llvm')
checkdepends=('lld' 'clang')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/wasmerio/wasmer/archive/v${pkgver}.tar.gz";)
-sha512sums=('f7bf5af7c05f8dbfb0b76244f752b5fd11744159a62dfcdf9d7f588fb2383fd24b585f8502de5f981ec87b57fc325bad35aed9f75533350629d869e0f7ebc9ec')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/wasmerio/wasmer/archive/v${pkgver}.tar.gz";
+ wasmer-fix-install-target.patch)
+sha512sums=('f7bf5af7c05f8dbfb0b76244f752b5fd11744159a62dfcdf9d7f588fb2383fd24b585f8502de5f981ec87b57fc325bad35aed9f75533350629d869e0f7ebc9ec'
+
'fef3788413e4ab32c6063d0038479c94004a85cd997ff954e3e9d9da835e704f3b9423b640a2134f4bdd5b5ad1b253bce4e3463e34fcc46c9ce6d9e0d034673b')
options=('staticlibs' '!lto')
+prepare() {
+ cd "$pkgname-$pkgver"
+ patch -Np1 -i "$srcdir/wasmer-fix-install-target.patch"
+}
+
build() {
cd "$pkgname-$pkgver"
make WASMER_INSTALL_PREFIX=/usr ENABLE_LLVM=1
@@ -28,9 +35,6 @@
package() {
cd "$pkgname-$pkgver"
make DESTDIR="$pkgdir"/usr install
-
- # Clean up weird so files.
- rm -r "$pkgdir"/usr/lib/libwasmer.so.file:
}
# vim:set ts=2 sw=2 et:
Added: wasmer-fix-install-target.patch
===================================================================
--- wasmer-fix-install-target.patch (rev 0)
+++ wasmer-fix-install-target.patch 2022-12-30 08:32:58 UTC (rev 1372361)
@@ -0,0 +1,23 @@
+From 560f51257934d1254f933d02088044fc27c03c69 Mon Sep 17 00:00:00 2001
+From: Sven-Hendrik Haase <[email protected]>
+Date: Fri, 30 Dec 2022 08:51:59 +0100
+Subject: [PATCH 1/2] Fix make install-capi-lib
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index c0f3a6d0d1..075abd414d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -703,7 +703,7 @@ install-capi-headers:
+
+ # Currently implemented for linux only. TODO
+ install-capi-lib:
+- pkgver=$$($(CARGO_BINARY) pkgid --manifest-path lib/c-api/Cargo.toml |
sed --posix 's/^.*wasmer-c-api:\([0-9.]*\)$\/\1/') && \
++ pkgver=$$($(CARGO_BINARY) pkgid --manifest-path lib/c-api/Cargo.toml |
sed 's/^.*wasmer-c-api@//') && \
+ shortver="$${pkgver%.*}" && \
+ majorver="$${shortver%.*}" && \
+ install -Dm755 target/release/libwasmer.so
"$(DESTDIR)/lib/libwasmer.so.$$pkgver" && \
+
