From 9a000b747b339beece82ed56599a37f15d9a92c9 Mon Sep 17 00:00:00 2001 From: q66 Date: Mon, 17 Dec 2018 19:19:03 +0100 Subject: [PATCH] wrk: fix build with LuaJIT 2.1, add aarch64, ppc64 targets --- srcpkgs/wrk/template | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/srcpkgs/wrk/template b/srcpkgs/wrk/template index b280c6e2d2..f66bb36df9 100644 --- a/srcpkgs/wrk/template +++ b/srcpkgs/wrk/template @@ -16,12 +16,13 @@ patch_args="-Np1" pre_build() { case "$XBPS_TARGET_MACHINE" in - aarch64*) - broken="LuaJIT not supported on $XBPS_TARGET_MACHINE" - ;; mips*) broken="__sync_fetch_and_add_8 and __sync_val_compare_and_swap_8 supported on $XBPS_TARGET_MACHINE" ;; + aarch64*) + make obj + luajit -b -a arm64 src/wrk.lua obj/bytecode.o + ;; armv[5-7]*) make obj luajit -b -a arm src/wrk.lua obj/bytecode.o @@ -30,9 +31,17 @@ pre_build() { make obj luajit -b -a x86 src/wrk.lua obj/bytecode.o ;; + ppc64le*) + make obj + luajit -b -a ppc64le src/wrk.lua obj/bytecode.o + ;; + ppc64*) + make obj + luajit -b -a ppc64 src/wrk.lua obj/bytecode.o + ;; esac # Borrow flags from Makefile - CFLAGS="-std=c99 -Wall -D_REENTRANT -D_POSIX_C_SOURCE=200112L -D_BSD_SOURCE -D_DEFAULT_SOURCE -I${XBPS_CROSS_BASE}/usr/include/luajit-2.0 ${CFLAGS}" + CFLAGS="-std=c99 -Wall -D_REENTRANT -D_POSIX_C_SOURCE=200112L -D_BSD_SOURCE -D_DEFAULT_SOURCE -I${XBPS_CROSS_BASE}/usr/include/luajit-2.1 ${CFLAGS}" LDFLAGS="-Wl,-E ${LDFLAGS}" }