summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach van Rijn <me@zv.io>2023-03-23 07:02:39 -0500
committerZach van Rijn <me@zv.io>2023-03-23 07:02:39 -0500
commit58b7707085dd1eb8b98cade916a17842531e4d19 (patch)
tree4bdd0288a7832dc17bb99668db50f52379744f4a
parent085106afc33011cf67001e8e92bbac6a6ab8bf76 (diff)
downloadpackages-58b7707085dd1eb8b98cade916a17842531e4d19.tar.gz
packages-58b7707085dd1eb8b98cade916a17842531e4d19.tar.bz2
packages-58b7707085dd1eb8b98cade916a17842531e4d19.tar.xz
packages-58b7707085dd1eb8b98cade916a17842531e4d19.zip
user/ol: patch out sys/cdefs.h check. fixes #974.
-rw-r--r--user/ol/APKBUILD7
-rw-r--r--user/ol/fix-cdefs-test.patch21
2 files changed, 26 insertions, 2 deletions
diff --git a/user/ol/APKBUILD b/user/ol/APKBUILD
index 0c085d6ff..12d08f6d9 100644
--- a/user/ol/APKBUILD
+++ b/user/ol/APKBUILD
@@ -10,7 +10,9 @@ license="LGPL-3.0+ OR MIT"
depends=""
makedepends="vim"
subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/yuriy-chumak/$pkgname/archive/$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/yuriy-chumak/$pkgname/archive/$pkgver.tar.gz
+ fix-cdefs-test.patch
+ "
build() {
make
@@ -24,4 +26,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="c280da70f04637e1c822ab5a4b6eda3a1e1602b4c1fbd59731be2619fb09b0acb079841ba142f9b7b80cbf7539b1c7bd15603311b2ae4a30636f174a1ba2499b ol-2.4.tar.gz"
+sha512sums="c280da70f04637e1c822ab5a4b6eda3a1e1602b4c1fbd59731be2619fb09b0acb079841ba142f9b7b80cbf7539b1c7bd15603311b2ae4a30636f174a1ba2499b ol-2.4.tar.gz
+b00c230aaec767b7ef8970813d47222088fd67545a8acebc66208ca7c795392b1db04a6a754ab53a2c0e9f222bf10fc47e082d0965a4253a7053dff1e5cd27f2 fix-cdefs-test.patch"
diff --git a/user/ol/fix-cdefs-test.patch b/user/ol/fix-cdefs-test.patch
new file mode 100644
index 000000000..41578836c
--- /dev/null
+++ b/user/ol/fix-cdefs-test.patch
@@ -0,0 +1,21 @@
+diff -ur a/tests/Makefile b/tests/Makefile
+--- a/tests/Makefile 2023-03-23 06:59:27.672116150 -0500
++++ b/tests/Makefile 2023-03-23 06:59:48.224536016 -0500
+@@ -17,8 +17,8 @@
+ failed:="\033[1;31mfailed\033[0m"
+
+ # 32-/64-bit test environment setup
+-HAS_32CDEFS ?= $(call exists,-m32,sys/cdefs.h,exit)
+-HAS_64CDEFS ?= $(call exists,-m64,sys/cdefs.h,exit)
++HAS_32CDEFS ?= 0
++HAS_64CDEFS ?= 0
+
+ ifeq ($(HAS_64CDEFS),1)
+ vm64 = printf "64 " && ./vm64 repl <$$F | diff - $$F.ok
+@@ -425,4 +425,4 @@
+ @if [ -e $(FAILED) ] ;then rm -f $(FAILED); exit 1 ;fi
+ @echo "\033[1;32mpassed!\033[0m"
+
+-endif
+\ No newline at end of file
++endif