From a385565d6fe3cd0a125c61ff5c6c9596a5c79d15 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Sat, 7 Oct 2017 18:26:18 +0200 Subject: [PATCH] luarocks: fix policy error (#1699) --- dev-lua/luarocks/luarocks-2.4.2.recipe | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/dev-lua/luarocks/luarocks-2.4.2.recipe b/dev-lua/luarocks/luarocks-2.4.2.recipe index 1c259fa6d..495e5f11c 100644 --- a/dev-lua/luarocks/luarocks-2.4.2.recipe +++ b/dev-lua/luarocks/luarocks-2.4.2.recipe @@ -4,16 +4,13 @@ packages called rocks, which also contain version dependency information." HOMEPAGE="http://luarocks.org" COPYRIGHT="2007-2014 Kepler Project" LICENSE="MIT" -REVISION="1" +REVISION="2" SOURCE_URI="http://luarocks.org/releases/luarocks-$portVersion.tar.gz" CHECKSUM_SHA256="0e1ec34583e1b265e0fbafb64c8bd348705ad403fe85967fd05d3a659f74d2e5" SOURCE_DIR="luarocks-$portVersion" -#check for Lua version -LUAVERSION=$(lua -v | sed 's/Lua //' | head -c3) - GLOBAL_WRITABLE_FILES=" - settings/config-$LUAVERSION.lua keep-old + settings/config-5.3.lua keep-old " ARCHITECTURES="x86_gcc2 x86 x86_64" @@ -23,8 +20,8 @@ PROVIDES=" luarocks$secondaryArchSuffix = $portVersion cmd:luarocks$secondaryArchSuffix = $portVersion cmd:luarocks_admin$secondaryArchSuffix = $portVersion - cmd:luarocks_$LUAVERSION$secondaryArchSuffix = $portVersion - cmd:luarocks_admin_$LUAVERSION$secondaryArchSuffix = $portVersion + cmd:luarocks_5.3$secondaryArchSuffix = $portVersion + cmd:luarocks_admin_5.3$secondaryArchSuffix = $portVersion " REQUIRES=" haiku$secondaryArchSuffix @@ -46,9 +43,8 @@ BUILD_PREREQUIRES=" BUILD() { - LUAVERSION_WITHOUT_DOTS=$(lua -v | sed 's/Lua //' | head -c3 | tr -d '.') ./configure --prefix=$prefix \ - --with-lua-include="$(finddir B_SYSTEM_HEADERS_DIRECTORY)$secondaryArchSubDir/lua$LUAVERSION_WITHOUT_DOTS" \ + --with-lua-include="$(finddir B_SYSTEM_HEADERS_DIRECTORY)$secondaryArchSubDir/lua53" \ --sysconfdir=$settingsDir \ --rocks-tree=/boot/home/config/non-packaged/data \ --versioned-rocks-dir \ @@ -57,5 +53,5 @@ BUILD() } INSTALL() { - make BINDIR=$binDir LUADIR=$libDir/lua/$LUAVERSION install + make BINDIR=$binDir LUADIR=$libDir/lua/5.3 install }