From: ahesford <ahesford@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] lua{,51,52}: move -devel alternatives to dedicated group
Date: Sun, 24 May 2020 11:35:48 +0200 [thread overview]
Message-ID: <20200524093548.mlDBmWFG-_Zru-yBMZReUChwUslmJlrI0Z4lhoxrnwM@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-21964@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 804 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages lua
https://github.com/void-linux/void-packages/pull/21964
lua{,51,52}: move -devel alternatives to dedicated group
The three lua packages all define alternatives that include headers and pkgconfig files; this results in broken links in `/usr` unless the `-devel` package for the selected lua alternative is also installed. I've moved the alternatives related to `-devel` subpackages into their own `lua-devel` alternatives group to avoid these broken symlinks, and to allow selection of a lua development environment that differs from the preferred lua execution environment.
A patch file from https://github.com/void-linux/void-packages/pull/21964.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lua-21964.patch --]
[-- Type: text/x-diff, Size: 7500 bytes --]
From 9eb9128bbf1081481d7436099be59432b2f42675 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 14 May 2020 11:16:48 -0400
Subject: [PATCH 1/3] lua: move -devel alternatives to dedicated group
---
srcpkgs/lua/template | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/lua/template b/srcpkgs/lua/template
index 82335783040..9172334c4e1 100644
--- a/srcpkgs/lua/template
+++ b/srcpkgs/lua/template
@@ -1,13 +1,13 @@
# Template file for 'lua'
pkgname=lua
version=5.3.5
-revision=2
+revision=3
makedepends="ncurses-devel readline-devel"
short_desc="Powerful, fast, lightweight, embeddable scripting language"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="http://www.lua.org"
-distfiles="http://www.lua.org/ftp/lua-${version}.tar.gz"
+homepage="https://www.lua.org"
+distfiles="https://www.lua.org/ftp/lua-${version}.tar.gz"
checksum=0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac
alternatives="
@@ -15,15 +15,6 @@ alternatives="
lua:luac:/usr/bin/luac5.3
lua:lua.1:/usr/share/man/man1/lua5.3.1
lua:luac.1:/usr/share/man/man1/luac5.3.1
- lua:lua:/usr/include/lua5.3
- lua:/usr/include/lua.h:/usr/include/lua5.3/lua.h
- lua:/usr/include/luaconf.h:/usr/include/lua5.3/luaconf.h
- lua:/usr/include/lua.hpp:/usr/include/lua5.3/lua.hpp
- lua:/usr/include/lualib.h:/usr/include/lua5.3/lualib.h
- lua:/usr/include/lauxlib.h:/usr/include/lua5.3/lauxlib.h
- lua:lua.pc:/usr/lib/pkgconfig/lua5.3.pc
- lua:liblua.a:/usr/lib/liblua5.3.a
- lua:liblua.so:/usr/lib/liblua5.3.so
lua:lua:/usr/share/doc/lua5.3
"
@@ -71,6 +62,17 @@ do_install() {
lua-devel_package() {
depends="${makedepends} lua>=${version}_${revision}"
short_desc+=" - development files"
+ alternatives="
+ lua-devel:lua:/usr/include/lua5.3
+ lua-devel:/usr/include/lua.h:/usr/include/lua5.3/lua.h
+ lua-devel:/usr/include/luaconf.h:/usr/include/lua5.3/luaconf.h
+ lua-devel:/usr/include/lua.hpp:/usr/include/lua5.3/lua.hpp
+ lua-devel:/usr/include/lualib.h:/usr/include/lua5.3/lualib.h
+ lua-devel:/usr/include/lauxlib.h:/usr/include/lua5.3/lauxlib.h
+ lua-devel:lua.pc:/usr/lib/pkgconfig/lua5.3.pc
+ lua-devel:liblua.a:/usr/lib/liblua5.3.a
+ lua-devel:liblua.so:/usr/lib/liblua5.3.so
+ "
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
From 8eccaf3f51d20ab5bd4a373db8337552e75ca48b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 14 May 2020 11:17:02 -0400
Subject: [PATCH 2/3] lua51: move -devel alternatives to dedicated group
---
srcpkgs/lua51/template | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/lua51/template b/srcpkgs/lua51/template
index c257b209ada..515fbd0f5d4 100644
--- a/srcpkgs/lua51/template
+++ b/srcpkgs/lua51/template
@@ -1,14 +1,14 @@
# Template file for 'lua51'
pkgname=lua51
version=5.1.5
-revision=8
+revision=9
wrksrc="lua-${version}"
makedepends="ncurses-devel readline-devel"
short_desc="Powerful, fast, lightweight, embeddable scripting language (5.1.x)"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://www.lua.org"
license="MIT"
-distfiles="http://www.lua.org/ftp/lua-$version.tar.gz"
+homepage="https://www.lua.org"
+distfiles="https://www.lua.org/ftp/lua-$version.tar.gz"
checksum=2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333
alternatives="
@@ -16,15 +16,6 @@ alternatives="
lua:luac:/usr/bin/luac5.1
lua:lua.1:/usr/share/man/man1/lua5.1.1
lua:luac.1:/usr/share/man/man1/luac5.1.1
- lua:lua:/usr/include/lua5.1
- lua:/usr/include/lua.h:/usr/include/lua5.1/lua.h
- lua:/usr/include/luaconf.h:/usr/include/lua5.1/luaconf.h
- lua:/usr/include/lua.hpp:/usr/include/lua5.1/lua.hpp
- lua:/usr/include/lualib.h:/usr/include/lua5.1/lualib.h
- lua:/usr/include/lauxlib.h:/usr/include/lua5.1/lauxlib.h
- lua:lua.pc:/usr/lib/pkgconfig/lua5.1.pc
- lua:liblua.a:/usr/lib/liblua5.1.a
- lua:liblua.so:/usr/lib/liblua5.1.so
lua:lua:/usr/share/doc/lua5.1
"
@@ -61,6 +52,17 @@ do_install() {
lua51-devel_package() {
depends="ncurses-devel readline-devel>=6.3 lua51>=${version}_${revision}"
short_desc+=" - development files"
+ alternatives="
+ lua-devel:lua:/usr/include/lua5.1
+ lua-devel:/usr/include/lua.h:/usr/include/lua5.1/lua.h
+ lua-devel:/usr/include/luaconf.h:/usr/include/lua5.1/luaconf.h
+ lua-devel:/usr/include/lua.hpp:/usr/include/lua5.1/lua.hpp
+ lua-devel:/usr/include/lualib.h:/usr/include/lua5.1/lualib.h
+ lua-devel:/usr/include/lauxlib.h:/usr/include/lua5.1/lauxlib.h
+ lua-devel:lua.pc:/usr/lib/pkgconfig/lua5.1.pc
+ lua-devel:liblua.a:/usr/lib/liblua5.1.a
+ lua-devel:liblua.so:/usr/lib/liblua5.1.so
+ "
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
From ca030c1d74b93847d58564516a302e830d973f98 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 14 May 2020 11:19:27 -0400
Subject: [PATCH 3/3] lua52: move -devel alternatives to dedicated group, add
update file
---
srcpkgs/lua52/template | 26 ++++++++++++++------------
srcpkgs/lua52/update | 1 +
2 files changed, 15 insertions(+), 12 deletions(-)
create mode 100644 srcpkgs/lua52/update
diff --git a/srcpkgs/lua52/template b/srcpkgs/lua52/template
index f2111d2f770..3cd12dbc63d 100644
--- a/srcpkgs/lua52/template
+++ b/srcpkgs/lua52/template
@@ -1,14 +1,14 @@
# Template file for 'lua52'
pkgname=lua52
version=5.2.4
-revision=7
+revision=8
wrksrc=lua-${version}
makedepends="ncurses-devel readline-devel"
short_desc="Powerful, fast, lightweight, embeddable scripting language (5.2.x)"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://www.lua.org"
license="MIT"
-distfiles="http://www.lua.org/ftp/lua-$version.tar.gz"
+homepage="https://www.lua.org"
+distfiles="https://www.lua.org/ftp/lua-$version.tar.gz"
checksum=b9e2e4aad6789b3b63a056d442f7b39f0ecfca3ae0f1fc0ae4e9614401b69f4b
alternatives="
@@ -16,15 +16,6 @@ alternatives="
lua:luac:/usr/bin/luac5.2
lua:lua.1:/usr/share/man/man1/lua5.2.1
lua:luac.1:/usr/share/man/man1/luac5.2.1
- lua:lua:/usr/include/lua5.2
- lua:/usr/include/lua.h:/usr/include/lua5.2/lua.h
- lua:/usr/include/luaconf.h:/usr/include/lua5.2/luaconf.h
- lua:/usr/include/lua.hpp:/usr/include/lua5.2/lua.hpp
- lua:/usr/include/lualib.h:/usr/include/lua5.2/lualib.h
- lua:/usr/include/lauxlib.h:/usr/include/lua5.2/lauxlib.h
- lua:lua.pc:/usr/lib/pkgconfig/lua5.2.pc
- lua:liblua.a:/usr/lib/liblua5.2.a
- lua:liblua.so:/usr/lib/liblua5.2.so
lua:lua:/usr/share/doc/lua5.2
"
@@ -66,6 +57,17 @@ do_install() {
lua52-devel_package() {
depends="${makedepends} lua52>=${version}_${revision}"
short_desc+=" - development files"
+ alternatives="
+ lua-devel:lua:/usr/include/lua5.2
+ lua-devel:/usr/include/lua.h:/usr/include/lua5.2/lua.h
+ lua-devel:/usr/include/luaconf.h:/usr/include/lua5.2/luaconf.h
+ lua-devel:/usr/include/lua.hpp:/usr/include/lua5.2/lua.hpp
+ lua-devel:/usr/include/lualib.h:/usr/include/lua5.2/lualib.h
+ lua-devel:/usr/include/lauxlib.h:/usr/include/lua5.2/lauxlib.h
+ lua-devel:lua.pc:/usr/lib/pkgconfig/lua5.2.pc
+ lua-devel:liblua.a:/usr/lib/liblua5.2.a
+ lua-devel:liblua.so:/usr/lib/liblua5.2.so
+ "
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
diff --git a/srcpkgs/lua52/update b/srcpkgs/lua52/update
new file mode 100644
index 00000000000..ec75cb54d7d
--- /dev/null
+++ b/srcpkgs/lua52/update
@@ -0,0 +1 @@
+pattern="lua-\K5.2[\d.]+(?=\.tar)"
next prev parent reply other threads:[~2020-05-24 9:35 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-14 15:25 [PR PATCH] " ahesford
2020-05-14 15:32 ` [PR PATCH] [Updated] " ahesford
2020-05-14 17:58 ` Duncaen
2020-05-14 18:03 ` [PR PATCH] [Updated] " ahesford
2020-05-14 18:05 ` ahesford
2020-05-14 18:17 ` Duncaen
2020-05-16 4:14 ` pullmoll
2020-05-16 4:16 ` pullmoll
2020-05-16 5:55 ` pullmoll
2020-05-16 5:55 ` pullmoll
2020-05-16 11:02 ` ahesford
2020-05-16 11:29 ` [PR PATCH] [Updated] " ahesford
2020-05-24 9:35 ` ahesford [this message]
2020-05-29 2:58 ` ahesford
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200524093548.mlDBmWFG-_Zru-yBMZReUChwUslmJlrI0Z4lhoxrnwM@z \
--to=ahesford@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).