plutolang: defer uname detection

mbekkomo · Apr 7, 2024 · 4fdbbef · 4fdbbef
1 parent 7b7c21a
commit 4fdbbef
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/packages/plutolang/build.sh b/packages/plutolang/build.sh
@@ -20,6 +20,7 @@ termux_step_pre_configure() {
 	CXXFLAGS+=" -std=c++17"
 	export MYCFLAGS="-fPIC $CXXFLAGS $CPPFLAGS"
 	export MYLDFLAGS="$LDFLAGS"
+	export TERMUX_ARCH
 
 	TERMUX_PKG_EXTRA_MAKE_ARGS+=" CXX=$(command -v $CXX)"
 }
diff --git a/packages/plutolang/defer-uname-detection.patch b/packages/plutolang/defer-uname-detection.patch
@@ -0,0 +1,17 @@
+diff --git a/src/vendor/Soup/Intrin/Makefile b/src/vendor/Soup/Intrin/Makefile
+index 5accbf7..2035c8f 100644
+--- a/src/vendor/Soup/Intrin/Makefile
++++ b/src/vendor/Soup/Intrin/Makefile
+@@ -1,10 +1,10 @@
+ CXX=g++ -std=c++17 -O3 -flto -fvisibility=hidden -fPIC
+ CFLAGS=-c -Wall
+
+-ifeq ($(shell uname -m),x86_64)
++ifeq ($(TERMUX_ARCH),x86_64)
+ 	CFLAGS+= -maes -mpclmul -mrdrnd -mrdseed -msha -msse4.1
+ endif
+-ifeq ($(shell uname -m),aarch64)
++ifeq ($(TERMUX_ARCH),aarch64)
+ 	CFLAGS+= -march=armv8-a+crypto+crc
+ endif
+