summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO2
-rw-r--r--0001-Fix-build-on-glibc-2.34.patch35
-rw-r--r--PKGBUILD9
3 files changed, 44 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 55df90acaff2..6a8c2bb4531c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -10,7 +10,9 @@ pkgbase = wren
noextract = wren-cli-0.4.0.tar.gz
source = wren-0.4.0.tar.gz::https://github.com/wren-lang/wren/archive/refs/tags/0.4.0.tar.gz
source = wren-cli-0.4.0.tar.gz::http://api.github.com/repos/wren-lang/wren-cli/tarball/961003d7e439f6cf9aa62aebd641ff67f8c93872
+ source = 0001-Fix-build-on-glibc-2.34.patch
sha256sums = 23c0ddeb6c67a4ed9285bded49f7c91714922c2e7bb88f42428386bf1cf7b339
sha256sums = 0116fde664ef418845aadd1388021caf6937068a81536f95ff55797a0c622d87
+ sha256sums = 2ea2d46392e9d4b13d2df30f235d3fdbbf1d7a4d9bd8c2ffaf104fabf8b7c588
pkgname = wren
diff --git a/0001-Fix-build-on-glibc-2.34.patch b/0001-Fix-build-on-glibc-2.34.patch
new file mode 100644
index 000000000000..fddfe6b8f48b
--- /dev/null
+++ b/0001-Fix-build-on-glibc-2.34.patch
@@ -0,0 +1,35 @@
+From 18553636618a4d33f10af9b5ab92da6431784a8c Mon Sep 17 00:00:00 2001
+From: Michel Hermier <michel.hermier@gmail.com>
+Date: Sat, 9 Apr 2022 02:09:23 +0200
+Subject: [PATCH] wren-cli: Fix build on glibc >= 2.34 (#136)
+
+* wren-cli: Fix build on glibc >= 2.34
+---
+ src/cli/vm.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/cli/vm.c b/src/cli/vm.c
+index 48d2b1e..cad75be 100644
+--- a/src/cli/vm.c
++++ b/src/cli/vm.c
+@@ -241,7 +241,7 @@ static WrenForeignClassMethods bindForeignClass(
+ return methods;
+ }
+
+-static void write(WrenVM* vm, const char* text)
++static void writeFn(WrenVM* vm, const char* text)
+ {
+ printf("%s", text);
+ }
+@@ -274,7 +274,7 @@ static void initVM()
+ config.bindForeignClassFn = bindForeignClass;
+ config.resolveModuleFn = resolveModule;
+ config.loadModuleFn = loadModule;
+- config.writeFn = write;
++ config.writeFn = writeFn;
+ config.errorFn = reportError;
+
+ // Since we're running in a standalone process, be generous with memory.
+--
+2.37.1
+
diff --git a/PKGBUILD b/PKGBUILD
index da080ff8bff4..057b8c5d062c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,15 +14,20 @@ url='https://wren.io/'
# NOTE: I pinned wren-cli to a specific commit (961003d7e439f) because there
# is currently no 0.4.0 release for wren-cli (see issue #108)
source=("wren-$pkgver.tar.gz::https://github.com/wren-lang/wren/archive/refs/tags/${pkgver}.tar.gz"
- "wren-cli-${pkgver}.tar.gz::http://api.github.com/repos/wren-lang/wren-cli/tarball/961003d7e439f6cf9aa62aebd641ff67f8c93872")
+ "wren-cli-${pkgver}.tar.gz::http://api.github.com/repos/wren-lang/wren-cli/tarball/961003d7e439f6cf9aa62aebd641ff67f8c93872"
+ "0001-Fix-build-on-glibc-2.34.patch")
sha256sums=('23c0ddeb6c67a4ed9285bded49f7c91714922c2e7bb88f42428386bf1cf7b339'
- '0116fde664ef418845aadd1388021caf6937068a81536f95ff55797a0c622d87')
+ '0116fde664ef418845aadd1388021caf6937068a81536f95ff55797a0c622d87'
+ '2ea2d46392e9d4b13d2df30f235d3fdbbf1d7a4d9bd8c2ffaf104fabf8b7c588')
# NOTE: Needs to be extracted manualy, because of the hacked commit (see note above)
noextract=("wren-cli-${pkgver}.tar.gz")
prepare() {
mkdir -p "${srcdir}/wren-cli-${pkgver}"
tar -xf "${SRCDEST}/wren-cli-${pkgver}.tar.gz" --strip-components=1 -C "${srcdir}/wren-cli-${pkgver}"
+ pushd "${srcdir}/wren-cli-${pkgver}" >/dev/null
+ patch -p1 < "${srcdir}/../0001-Fix-build-on-glibc-2.34.patch"
+ popd >/dev/null
}
build() {