Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (6e247fd60f31df965c0450ea215f489a1c061736)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (6e247fd60f31df965c0450ea215f489a1c061736)
  • Date: Thu, 24 May 2018 16:30:35 +0000

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

lua-forge/lua/DETAILS | 5 ++---
lua-forge/lua/HISTORY | 5 +++++
lua-forge/lua/INSTALL | 8 ++++++--
lua-forge/lua/PRE_BUILD | 2 +-
lua-forge/lua/shared.patch | 2 +-
5 files changed, 15 insertions(+), 7 deletions(-)

New commits:
commit 6e247fd60f31df965c0450ea215f489a1c061736
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

lua: => 5.3.4

diff --git a/lua-forge/lua/DETAILS b/lua-forge/lua/DETAILS
index 6c977d9..485736c 100755
--- a/lua-forge/lua/DETAILS
+++ b/lua-forge/lua/DETAILS
@@ -1,11 +1,10 @@
SPELL=lua
- VERSION=5.3.3
- PATCHLEVEL=1
+ VERSION=5.3.4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://www.lua.org/ftp/$SOURCE
SOURCE_URL[1]=http://www.tecgraf.puc-rio.br/lua/mirror/ftp/$SOURCE
-
SOURCE_HASH=sha512:7b8122ed48ea2a9faa47d1b69b4a5b1523bb7be67e78f252bb4339bf75e957a88c5405156e22b4b63ccf607a5407bf017a4cee1ce12b1aa5262047655960a3cc
+
SOURCE_HASH=sha512:739e31f82e6a60fa99910c2005e991b3a1e21339af52847f653cb190b30842054d189ca116ffcfdf9b36e07888c9ce5642b1dd2988cc7eff9f8789f9a2e34997
WEB_SITE=http://www.lua.org/
ENTERED=20020309
LICENSE[0]=MIT
diff --git a/lua-forge/lua/HISTORY b/lua-forge/lua/HISTORY
index f94613c..b79486e 100644
--- a/lua-forge/lua/HISTORY
+++ b/lua-forge/lua/HISTORY
@@ -1,3 +1,8 @@
+2018-05-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 5.3.4
+ * PRE_BUILD, INSTALL: detect the branch
+ * shared.patch: use subst to set SO name dynamically
+
2017-02-04 Thomas Orgis <sobukus AT sourcemage.org>
* PRE_BUILD: fix lua.pc, need to turn $V into ${V} in deref
* DETAILS: ++PATCHLEVEL
diff --git a/lua-forge/lua/INSTALL b/lua-forge/lua/INSTALL
index 04f8d1e..bc7f523 100755
--- a/lua-forge/lua/INSTALL
+++ b/lua-forge/lua/INSTALL
@@ -2,7 +2,7 @@ make INSTALL_TOP="$INSTALL_ROOT/usr" \
INSTALL_MAN="$INSTALL_ROOT/usr/share/man/man1" install &&

# install shared library and symlinks
-local SO="liblua.so.5.3" &&
+local SO="liblua.so.${VERSION%.?}" &&

install -vm 755 "src/${SO}" "$INSTALL_ROOT/usr/lib" &&
ln -vsf "$TRACK_ROOT/usr/lib/${SO}" "$INSTALL_ROOT/usr/lib/liblua.so" &&
@@ -10,4 +10,8 @@ ln -vsf "$TRACK_ROOT/usr/lib/${SO}"
"$INSTALL_ROOT/usr/lib/liblua.so.5" &&

# install pkgconfig description file
install -vm 755 -d "$INSTALL_ROOT/usr/lib/pkgconfig" &&
-install -vm 644 "$SOURCE_DIRECTORY/lua.pc" "$INSTALL_ROOT/usr/lib/pkgconfig"
+
+local PC="/usr/lib/pkgconfig/lua$(echo ${VERSION%.?} | tr -d '.').pc" &&
+
+install -vm 644 "${SOURCE_DIRECTORY}/lua.pc" "${INSTALL_ROOT}${PC}" &&
+ln -vsf "${TRACK_ROOT}${PC}" "${INSTALL_ROOT}/usr/lib/pkgconfig/lua.pc"
diff --git a/lua-forge/lua/PRE_BUILD b/lua-forge/lua/PRE_BUILD
index e84eb0b..f082c51 100755
--- a/lua-forge/lua/PRE_BUILD
+++ b/lua-forge/lua/PRE_BUILD
@@ -5,7 +5,7 @@ cd "$SOURCE_DIRECTORY" &&
sedit "s:/usr/local:$INSTALL_ROOT/usr:" src/luaconf.h &&

# build shared library
-patch -p0 < "$SPELL_DIRECTORY/shared.patch" &&
+sed "s:%%BRANCH%%:${VERSION%.?}:" "${SPELL_DIRECTORY}/shared.patch" | patch
-p0 &&

echo '# lua.pc -- pkg-config data for Lua' > "${SOURCE_DIRECTORY}/lua.pc" &&
grep '^V=' "${SOURCE_DIRECTORY}/Makefile" >> "${SOURCE_DIRECTORY}/lua.pc" &&
diff --git a/lua-forge/lua/shared.patch b/lua-forge/lua/shared.patch
index 361e901..7302ce7 100644
--- a/lua-forge/lua/shared.patch
+++ b/lua-forge/lua/shared.patch
@@ -4,7 +4,7 @@
LUAC_T= luac
LUAC_O= luac.o

-+LUA_SO= liblua.so.5.3
++LUA_SO= liblua.so.%%BRANCH%%
+
ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (6e247fd60f31df965c0450ea215f489a1c061736), Vlad Glagolev, 05/24/2018

Archive powered by MHonArc 2.6.24.

Top of Page