From b8fea24ec01c8de3dd7cb35a6d7f0af07f896365 Mon Sep 17 00:00:00 2001 From: hung Date: Fri, 3 Apr 2020 11:57:29 +0700 Subject: [PATCH] awesome: add build option for building with luajit --- srcpkgs/awesome/template | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/srcpkgs/awesome/template b/srcpkgs/awesome/template index d372beedbd6..98ee8cc54da 100644 --- a/srcpkgs/awesome/template +++ b/srcpkgs/awesome/template @@ -1,7 +1,7 @@ # Template file for 'awesome' pkgname=awesome version=4.3 -revision=6 +revision=7 build_style=cmake build_helper="qemu" configure_args="-DSYSCONFDIR=/etc" @@ -11,7 +11,7 @@ makedepends="libxcb-devel pango-devel xcb-util-devel xcb-util-image-devel xcb-util-keysyms-devel xcb-util-wm-devel xcb-util-cursor-devel startup-notification-devel imlib2-devel lua53-lgi libxdg-basedir-devel gdk-pixbuf-devel lua53-devel dbus-devel libxkbcommon-devel xcb-util-xrm-devel" -depends="dbus-x11 lua53-lgi>=0.7.2 pango" +depends="dbus-x11 $(vopt_if jit lua51-lgi lua53-lgi)>=0.7.2 pango" short_desc="Highly configurable, next gen framework window manager for X" maintainer="Orphaned " license="GPL-2.0-or-later" @@ -19,9 +19,32 @@ homepage="http://awesomewm.org" distfiles="https://github.com/awesomeWM/awesome/releases/download/v${version}/awesome-${version}.tar.xz" checksum=78264d6f012350b371e339127aca485260bc0aa935eff578ba75ce1a00e11753 +build_options="jit" +desc_option_jit="Use LuaJIT instead of lua" + +hostmakedepends+=" $(vopt_if jit 'lua51 LuaJIT lua51-lgi' 'lua lua-lgi')" +makedepends+=" $(vopt_if jit \ + 'lua51-devel LuaJIT-devel lua51-lgi' \ + 'lua-devel lua-lgi')" +depends+=" $(vopt_if jit lua51 lua)-lgi>=0.7.2" +_luaname="$(vopt_if jit luajit lua)" + +if [ "$_luaname" = "luajit" ]; then + configure_args+=" + -DLUA_LIBRARY=$XBPS_CROSS_BASE/usr/lib/libluajit-5.1.so + -DLUA_INCLUDE_DIR=$XBPS_CROSS_BASE/usr/include/luajit-2.1" +fi + pre_configure() { # Russian manpages fail to build. vsed -i -e "s|es fr de ru|es fr de|g" CMakeLists.txt + + # Use correct lua name + vsed -e "s|COMMAND lua\b|COMMAND ${_luaname}|" \ + -i awesomeConfig.cmake \ + -i tests/examples/CMakeLists.txt + vsed -e "s|LUA_COV_RUNNER lua\b|LUA_COV_RUNNER ${_luaname}|" \ + -i tests/examples/CMakeLists.txt } post_install() {