Merge branch 'master' of https://gitlab.redox-os.org/redox-os/cookbook

recipes/dev/lua54/recipe.toml

@@ -11,7 +11,5 @@ rsync -av --delete "${COOKBOOK_SOURCE}/" ./
     CC="${TARGET}-gcc -std=gnu99" \
     RANLIB="${TARGET}-ranlib" \
     SYSLDFLAGS="-static" \
-    generic
-mkdir -pv "${COOKBOOK_STAGE}/bin"
-cp src/lua src/luac "${COOKBOOK_STAGE}/bin"
+    install INSTALL_TOP="${COOKBOOK_STAGE}"
 """

recipes/dev/luarocks/recipe.toml

@@ -0,0 +1,18 @@
+[source]
+git = "https://github.com/luarocks/luarocks.git"
+[build]
+template = "custom"
+dependencies = [
+"lua54"
+]
+script = """
+
+COOKBOOK_CONFIGURE_FLAGS=(
+    --sysconfdir=$COOKBOOK_SYSROOT
+    --with-lua-include=$COOKBOOK_SYSROOT/include
+    --with-lua-bin=$COOKBOOK_SYSROOT/bin
+    --with-lua-lib=$COOKBOOK_SYSROOT/lib
+)
+cd "${COOKBOOK_SOURCE}"
+cookbook_configure
+"""

recipes/libs/lua-compat-5.3/recipe.toml

@@ -0,0 +1,11 @@
+[source]
+git = "https://github.com/lunarmodules/lua-compat-5.3.git"
+[build]
+template = "custom"
+dependencies = [
+    "lua54"
+]
+script = """
+mkdir -pv "${COOKBOOK_STAGE}/include"
+cp -r "$COOKBOOK_SOURCE/c-api/." "${COOKBOOK_STAGE}/include"
+"""

recipes/libs/luv/recipe.toml

@@ -0,0 +1,27 @@
+[source]
+git = "https://github.com/luvit/luv.git"
+[build]
+template = "custom"
+dependencies = [
+    "lua54",
+    "libuv",
+    "lua-compat-5.3"
+]
+script = """
+COOKBOOK_CONFIGURE="cmake"
+COOKBOOK_CONFIGURE_FLAGS=(
+    -DBUILD_MODULE=OFF
+    -DBUILD_STATIC_LIBS=ON
+    -DWITH_SHARED_LIBUV=ON
+    -DWITH_LUA_ENGINE=Lua
+    -DLUA_BUILD_TYPE=System
+    -DLUA_COMPAT53_DIR="${COOKBOOK_SYSROOT}/bin"
+    -DCMAKE_BUILD_TYPE=RelWithDebInfo
+    -DLIBUV_LIBRARIES="${COOKBOOK_SYSROOT}/usr/lib/libuv.a"
+    -DLIBUV_INCLUDE_DIR="${COOKBOOK_SYSROOT}/usr/include"
+    -DLUA_INCLUDE_DIR="${COOKBOOK_SYSROOT}/include"
+    -DLUV_INCLUDE_DIR="${COOKBOOK_SYSROOT}/include"
+"${COOKBOOK_SOURCE}"
+)
+cookbook_configure
+"""

recipes/wip/dev/lua-tools/luarocks/recipe.toml

@@ -1,6 +0,0 @@
-#TODO not compiled or tested
-# build instructions - https://github.com/luarocks/luarocks/wiki/Installation-instructions-for-Unix
-[source]
-tar = "https://luarocks.org/releases/luarocks-3.11.1.tar.gz"
-[build]
-template = "configure"