[PR PATCH] neovim: add buildoption to build with lua5.1

[PR PATCH] neovim: add buildoption to build with lua5.1

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 1354 bytes --]

There is a new pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages neovim
https://github.com/void-linux/void-packages/pull/41728

neovim: add buildoption to build with lua5.1
- libluv: add buildoption to build with lua5.1
- neovim: add buildoption to build with lua5.1

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/41728.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-neovim-41728.patch --]
[-- Type: text/x-diff, Size: 3433 bytes --]

From 835e4f949fd4a9b7b40a3ed00959ae2fef211b1f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 18 Jan 2023 22:16:11 +0100
Subject: [PATCH 1/2] libluv: add buildoption to build with lua5.1

---
 srcpkgs/libluv/template | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libluv/template b/srcpkgs/libluv/template
index 5f84537bd4ac..ac4a43f18a88 100644
--- a/srcpkgs/libluv/template
+++ b/srcpkgs/libluv/template
@@ -4,19 +4,28 @@ version=1.43.0.0
 revision=1
 _distver="${version%.*}-${version##*.}"
 build_style=cmake
-configure_args="-DLUA_BUILD_TYPE=System -DBUILD_MODULE=OFF -DBUILD_SHARED_LIBS=ON"
-makedepends="libuv-devel LuaJIT-devel"
-depends="libuv LuaJIT"
+configure_args="-DLUA_BUILD_TYPE=System -DBUILD_MODULE=OFF -DBUILD_SHARED_LIBS=ON
+ -DWITH_LUA_ENGINE=$(vopt_if luajit LuaJIT Lua)"
+makedepends="libuv-devel $(vopt_if luajit LuaJIT-devel lua51-devel)"
+depends="libuv $(vopt_if luajit LuaJIT lua51)"
 short_desc="Bare libuv bindings for LuaJIT"
 maintainer="andry-dev <peketribal2@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/luvit/luv"
 distfiles="https://github.com/luvit/luv/releases/download/${_distver}/luv-${_distver}.tar.gz
-			https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
+ https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
 checksum="567a6f3dcdcf8a9b54ddc57ffef89d1e950d72832b85ee81c8c83a9d4e0e9de2
  be2a4909c724e09a50de42b1caa3c82c1b1afee8b80abf20c6944f1df1c7fd0e"
 skip_extraction="libluv.pc.in"
 
+build_option=luajit
+
+case "$XBPS_TARGET_MACHINE" in
+	riscv64*) build_options_default="" ;;
+	*) build_options_default="luajit" ;;
+esac
+
+
 if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
 	hostmakedepends+=" gcc-multilib"
 fi

From 070b02268c0bb49743c070268a5bf3d542079272 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 18 Jan 2023 22:16:21 +0100
Subject: [PATCH 2/2] neovim: add buildoption to build with lua5.1

---
 srcpkgs/neovim/template | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template
index 34c36c2f8fbc..a1154d902397 100644
--- a/srcpkgs/neovim/template
+++ b/srcpkgs/neovim/template
@@ -4,10 +4,11 @@ version=0.8.2
 revision=2
 build_style=cmake
 build_helper="qemu"
-configure_args="-DCOMPILE_LUA=OFF"
-hostmakedepends="pkg-config gettext gperf LuaJIT lua51-lpeg lua51-mpack"
+configure_args="-DCOMPILE_LUA=OFF -DPREFER_LUA=$(vopt_if luajit OFF ON)"
+hostmakedepends="pkg-config gettext gperf lua51-lpeg lua51-mpack lua51-BitOp
+ $(vopt_if luajit LujaJIT lua51)"
 makedepends="libtermkey-devel libuv-devel libvterm-devel msgpack-devel
- LuaJIT-devel libluv-devel tree-sitter-devel"
+ libluv-devel tree-sitter-devel $(vopt_if luajit LuaJIT-devel lua51-devel)"
 short_desc="Fork of Vim aiming to improve user experience, plugins and GUIs"
 maintainer="Marcin Puc <tranzystorek.io@protonmail.com>"
 license="Apache-2.0, Vim"
@@ -15,6 +16,13 @@ homepage="https://neovim.io"
 distfiles="https://github.com/neovim/neovim/archive/refs/tags/v${version}.tar.gz"
 checksum=c516c8db73e1b12917a6b2e991b344d0914c057cef8266bce61a2100a28ffcc9
 
+build_option=luajit
+
+case "$XBPS_TARGET_MACHINE" in
+	riscv64*) build_options_default="" ;;
+	*) build_options_default="luajit" ;;
+esac
+
 alternatives="
  vi:vi:/usr/bin/nvim
  vi:vi.1:/usr/share/man/man1/nvim.1

Re: [PR PATCH] [Updated] neovim: add buildoption to build with lua5.1

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 1359 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages neovim
https://github.com/void-linux/void-packages/pull/41728

neovim: add buildoption to build with lua5.1
- libluv: add buildoption to build with lua5.1
- neovim: add buildoption to build with lua5.1

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/41728.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-neovim-41728.patch --]
[-- Type: text/x-diff, Size: 3435 bytes --]

From aa156c0eccfe22adaec1dc9217e0c32724202ff0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 18 Jan 2023 22:16:11 +0100
Subject: [PATCH 1/2] libluv: add buildoption to build with lua5.1

---
 srcpkgs/libluv/template | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libluv/template b/srcpkgs/libluv/template
index 5f84537bd4ac..07e12ecb7e61 100644
--- a/srcpkgs/libluv/template
+++ b/srcpkgs/libluv/template
@@ -4,19 +4,28 @@ version=1.43.0.0
 revision=1
 _distver="${version%.*}-${version##*.}"
 build_style=cmake
-configure_args="-DLUA_BUILD_TYPE=System -DBUILD_MODULE=OFF -DBUILD_SHARED_LIBS=ON"
-makedepends="libuv-devel LuaJIT-devel"
-depends="libuv LuaJIT"
+configure_args="-DLUA_BUILD_TYPE=System -DBUILD_MODULE=OFF -DBUILD_SHARED_LIBS=ON
+ -DWITH_LUA_ENGINE=$(vopt_if luajit LuaJIT Lua)"
+makedepends="libuv-devel $(vopt_if luajit LuaJIT-devel lua51-devel)"
+depends="libuv $(vopt_if luajit LuaJIT lua51)"
 short_desc="Bare libuv bindings for LuaJIT"
 maintainer="andry-dev <peketribal2@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/luvit/luv"
 distfiles="https://github.com/luvit/luv/releases/download/${_distver}/luv-${_distver}.tar.gz
-			https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
+ https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
 checksum="567a6f3dcdcf8a9b54ddc57ffef89d1e950d72832b85ee81c8c83a9d4e0e9de2
  be2a4909c724e09a50de42b1caa3c82c1b1afee8b80abf20c6944f1df1c7fd0e"
 skip_extraction="libluv.pc.in"
 
+build_options=luajit
+
+case "$XBPS_TARGET_MACHINE" in
+	riscv64*) build_options_default="" ;;
+	*) build_options_default="luajit" ;;
+esac
+
+
 if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
 	hostmakedepends+=" gcc-multilib"
 fi

From e4bd195d956bfe404290af3178631c396a724105 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 18 Jan 2023 22:16:21 +0100
Subject: [PATCH 2/2] neovim: add buildoption to build with lua5.1

---
 srcpkgs/neovim/template | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template
index 34c36c2f8fbc..289450088da0 100644
--- a/srcpkgs/neovim/template
+++ b/srcpkgs/neovim/template
@@ -4,10 +4,11 @@ version=0.8.2
 revision=2
 build_style=cmake
 build_helper="qemu"
-configure_args="-DCOMPILE_LUA=OFF"
-hostmakedepends="pkg-config gettext gperf LuaJIT lua51-lpeg lua51-mpack"
+configure_args="-DCOMPILE_LUA=OFF -DPREFER_LUA=$(vopt_if luajit OFF ON)"
+hostmakedepends="pkg-config gettext gperf lua51-lpeg lua51-mpack lua51-BitOp
+ $(vopt_if luajit LujaJIT lua51)"
 makedepends="libtermkey-devel libuv-devel libvterm-devel msgpack-devel
- LuaJIT-devel libluv-devel tree-sitter-devel"
+ libluv-devel tree-sitter-devel $(vopt_if luajit LuaJIT-devel lua51-devel)"
 short_desc="Fork of Vim aiming to improve user experience, plugins and GUIs"
 maintainer="Marcin Puc <tranzystorek.io@protonmail.com>"
 license="Apache-2.0, Vim"
@@ -15,6 +16,13 @@ homepage="https://neovim.io"
 distfiles="https://github.com/neovim/neovim/archive/refs/tags/v${version}.tar.gz"
 checksum=c516c8db73e1b12917a6b2e991b344d0914c057cef8266bce61a2100a28ffcc9
 
+build_options=luajit
+
+case "$XBPS_TARGET_MACHINE" in
+	riscv64*) build_options_default="" ;;
+	*) build_options_default="luajit" ;;
+esac
+
 alternatives="
  vi:vi:/usr/bin/nvim
  vi:vi.1:/usr/share/man/man1/nvim.1

Re: [PR PATCH] [Updated] neovim: add buildoption to build with lua5.1

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 1359 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages neovim
https://github.com/void-linux/void-packages/pull/41728

neovim: add buildoption to build with lua5.1
- libluv: add buildoption to build with lua5.1
- neovim: add buildoption to build with lua5.1

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/41728.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-neovim-41728.patch --]
[-- Type: text/x-diff, Size: 3434 bytes --]

From aa156c0eccfe22adaec1dc9217e0c32724202ff0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 18 Jan 2023 22:16:11 +0100
Subject: [PATCH 1/2] libluv: add buildoption to build with lua5.1

---
 srcpkgs/libluv/template | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libluv/template b/srcpkgs/libluv/template
index 5f84537bd4ac..07e12ecb7e61 100644
--- a/srcpkgs/libluv/template
+++ b/srcpkgs/libluv/template
@@ -4,19 +4,28 @@ version=1.43.0.0
 revision=1
 _distver="${version%.*}-${version##*.}"
 build_style=cmake
-configure_args="-DLUA_BUILD_TYPE=System -DBUILD_MODULE=OFF -DBUILD_SHARED_LIBS=ON"
-makedepends="libuv-devel LuaJIT-devel"
-depends="libuv LuaJIT"
+configure_args="-DLUA_BUILD_TYPE=System -DBUILD_MODULE=OFF -DBUILD_SHARED_LIBS=ON
+ -DWITH_LUA_ENGINE=$(vopt_if luajit LuaJIT Lua)"
+makedepends="libuv-devel $(vopt_if luajit LuaJIT-devel lua51-devel)"
+depends="libuv $(vopt_if luajit LuaJIT lua51)"
 short_desc="Bare libuv bindings for LuaJIT"
 maintainer="andry-dev <peketribal2@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/luvit/luv"
 distfiles="https://github.com/luvit/luv/releases/download/${_distver}/luv-${_distver}.tar.gz
-			https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
+ https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
 checksum="567a6f3dcdcf8a9b54ddc57ffef89d1e950d72832b85ee81c8c83a9d4e0e9de2
  be2a4909c724e09a50de42b1caa3c82c1b1afee8b80abf20c6944f1df1c7fd0e"
 skip_extraction="libluv.pc.in"
 
+build_options=luajit
+
+case "$XBPS_TARGET_MACHINE" in
+	riscv64*) build_options_default="" ;;
+	*) build_options_default="luajit" ;;
+esac
+
+
 if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
 	hostmakedepends+=" gcc-multilib"
 fi

From b064c0c34d824d548c5bfa03184a1c0b8cea8f86 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 18 Jan 2023 22:16:21 +0100
Subject: [PATCH 2/2] neovim: add buildoption to build with lua5.1

---
 srcpkgs/neovim/template | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template
index 34c36c2f8fbc..95c1f0731068 100644
--- a/srcpkgs/neovim/template
+++ b/srcpkgs/neovim/template
@@ -4,10 +4,11 @@ version=0.8.2
 revision=2
 build_style=cmake
 build_helper="qemu"
-configure_args="-DCOMPILE_LUA=OFF"
-hostmakedepends="pkg-config gettext gperf LuaJIT lua51-lpeg lua51-mpack"
+configure_args="-DCOMPILE_LUA=OFF -DPREFER_LUA=$(vopt_if luajit OFF ON)"
+hostmakedepends="pkg-config gettext gperf lua51-lpeg lua51-mpack lua51-BitOp
+ $(vopt_if luajit LuaJIT lua51)"
 makedepends="libtermkey-devel libuv-devel libvterm-devel msgpack-devel
- LuaJIT-devel libluv-devel tree-sitter-devel"
+ libluv-devel tree-sitter-devel $(vopt_if luajit LuaJIT-devel lua51-devel)"
 short_desc="Fork of Vim aiming to improve user experience, plugins and GUIs"
 maintainer="Marcin Puc <tranzystorek.io@protonmail.com>"
 license="Apache-2.0, Vim"
@@ -15,6 +16,13 @@ homepage="https://neovim.io"
 distfiles="https://github.com/neovim/neovim/archive/refs/tags/v${version}.tar.gz"
 checksum=c516c8db73e1b12917a6b2e991b344d0914c057cef8266bce61a2100a28ffcc9
 
+build_options=luajit
+
+case "$XBPS_TARGET_MACHINE" in
+	riscv64*) build_options_default="" ;;
+	*) build_options_default="luajit" ;;
+esac
+
 alternatives="
  vi:vi:/usr/bin/nvim
  vi:vi.1:/usr/share/man/man1/nvim.1

Re: [PR PATCH] [Merged]: neovim: add buildoption to build with lua5.1

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 1196 bytes --]

There's a merged pull request on the void-packages repository

neovim: add buildoption to build with lua5.1
https://github.com/void-linux/void-packages/pull/41728

Description:
- libluv: add buildoption to build with lua5.1
- neovim: add buildoption to build with lua5.1

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->