Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (533b81fa83ca36b095f0533354c2f2e85d479772)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (533b81fa83ca36b095f0533354c2f2e85d479772)
  • Date: Tue, 4 Apr 2023 00:27:32 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

lua-forge/libmpack-lua/BUILD | 4 ++--
lua-forge/libmpack-lua/HISTORY | 5 ++++-
lua-forge/libmpack-lua/INSTALL | 4 ++--
lua-forge/lpeg/HISTORY | 9 ++++++---
lua-forge/lpeg/INSTALL | 2 +-
5 files changed, 15 insertions(+), 9 deletions(-)

New commits:
commit 533b81fa83ca36b095f0533354c2f2e85d479772
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

lua-forge/lpeg: enabled for other lua providers

commit 44a82cfbdeb35528ea240de1ecf1fddaa9b26fde
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

lua-forge/libmpack-lua: enabled for other lua providers

diff --git a/lua-forge/libmpack-lua/BUILD b/lua-forge/libmpack-lua/BUILD
index f78328f..0dbd790 100755
--- a/lua-forge/libmpack-lua/BUILD
+++ b/lua-forge/libmpack-lua/BUILD
@@ -1,9 +1,9 @@
-local LUAVER &&
+local MPACK_LUA_VERSION &&
if is_depends_enabled $SPELL luajit; then
MPACK_LUA_VERSION=5.1.0 &&
LUA_IMPL=luajit
else
- MPACK_LUA_VERSION="$(installed_version lua)" &&
+ MPACK_LUA_VERSION="$(installed_version $(get_spell_provider ${SPELL}
LUA))" &&
LUA_IMPL=lua-${MPACK_LUA_VERSION}
fi &&

diff --git a/lua-forge/libmpack-lua/HISTORY b/lua-forge/libmpack-lua/HISTORY
index 8725276..d287e6b 100644
--- a/lua-forge/libmpack-lua/HISTORY
+++ b/lua-forge/libmpack-lua/HISTORY
@@ -1,5 +1,8 @@
+2023-04-03 Pavel Vinogradov <public AT sourcemage.org>
+ * BUILD, INSTALL: added provider detection for lua other than luajit
+
2022-06-04 Florian Franzmann <bwlf AT bandrate.org>
- * BUILD, DEPENDS, INSTALL: fix lua-version handling
+ * BUILD, DEPENDS, INSTALL: fix lua-version handling

2021-10-11 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 1.0.9
diff --git a/lua-forge/libmpack-lua/INSTALL b/lua-forge/libmpack-lua/INSTALL
index ea21621..a8be838 100755
--- a/lua-forge/libmpack-lua/INSTALL
+++ b/lua-forge/libmpack-lua/INSTALL
@@ -1,8 +1,8 @@
-local LUAVER &&
+local MPACK_LUA_VERSION &&
if is_depends_enabled $SPELL luajit; then
MPACK_LUA_VERSION=5.1.0
else
- MPACK_LUA_VERSION="$(installed_version lua)"
+ MPACK_LUA_VERSION="$(installed_version $(get_spell_provider ${SPELL} LUA))"
fi &&

make install \
diff --git a/lua-forge/lpeg/HISTORY b/lua-forge/lpeg/HISTORY
index cdec6e7..356780d 100644
--- a/lua-forge/lpeg/HISTORY
+++ b/lua-forge/lpeg/HISTORY
@@ -1,8 +1,11 @@
+2023-04-03 Pavel Vinogradov <public AT sourcemage.org>
+ * INSTALL: added provider detection for lua other than luajit
+
2022-06-04 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 1.0.2
- * BUILD: fix build against luajit
- * patches/0001-Respect-CC-CFLAGS-LDFLAGS.patch, PRE_BUILD: respect CC,
CFLAGS, LDFLAGS
- * INSTALL: fix installation path for luajit
+ * BUILD: fix build against luajit
+ * patches/0001-Respect-CC-CFLAGS-LDFLAGS.patch, PRE_BUILD: respect
CC, CFLAGS, LDFLAGS
+ * INSTALL: fix installation path for luajit

2018-05-11 Vlad Glagolev <stealth AT sourcemage.org>
* INSTALL: correct build failure
diff --git a/lua-forge/lpeg/INSTALL b/lua-forge/lpeg/INSTALL
index 52d87bf..10bd076 100755
--- a/lua-forge/lpeg/INSTALL
+++ b/lua-forge/lpeg/INSTALL
@@ -2,7 +2,7 @@ local LUA
if is_depends_enabled $SPELL luajit; then
LUA=5.1.0
else
- LUA=$(installed_version lua)
+ LUA="$(installed_version $(get_spell_provider ${SPELL} LUA))"
fi &&

message "${MESSAGE_COLOR}installing $SPELL for lua version
${LUA}${DEFAULT_COLOR}" &&



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (533b81fa83ca36b095f0533354c2f2e85d479772), Pavel Vinogradov, 04/03/2023

Archive powered by MHonArc 2.6.24.

Top of Page