Skip to Content.
Sympa Menu

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

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 (3e6c30b10a084b635abf8f084f8c197ebd3e6f6e)
  • Date: Fri, 22 Aug 2008 10:17:55 -0500

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

lua-forge/lua/DETAILS | 6 +++---
lua-forge/lua/HISTORY | 4 ++++
lua-forge/lua/INSTALL | 2 +-
lua-forge/lua/PRE_BUILD | 14 ++++++++++----
lua-forge/lua/patch-src_Makefile | 6 +++---
5 files changed, 21 insertions(+), 11 deletions(-)

New commits:
commit 3e6c30b10a084b635abf8f084f8c197ebd3e6f6e
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

lua: => 5.1.4 + small fixups

diff --git a/lua-forge/lua/DETAILS b/lua-forge/lua/DETAILS
index ad71ead..bd50f6b 100755
--- a/lua-forge/lua/DETAILS
+++ b/lua-forge/lua/DETAILS
@@ -1,10 +1,10 @@
SPELL=lua
- VERSION=5.1.3
+ VERSION=5.1.4
SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://www.lua.org/ftp/$SOURCE
SOURCE_URL[1]=ftp://ftp.tecgraf.puc-rio.br/pub/lua/$SOURCE
-
SOURCE_HASH=sha512:94f8fc748f8cdf966a9f2f6cc0fe4b7dca1f07164849c799c8840fe45bd8a63d9e06b34742cd963b7df0e6c5e76f095a55c85d31360cd24eead36dffd8c552d2
+
SOURCE_HASH=sha512:bc542fe8535826ac1e49b03a8f238cf049724b02c14718f8162cfeaf735a5e6c58412ff18dbe7a38e4cc4433f3d1e702554e9b24b5f021634b4280880980f40f
WEB_SITE=http://www.lua.org/
ENTERED=20020309
LICENSE[0]=MIT
diff --git a/lua-forge/lua/HISTORY b/lua-forge/lua/HISTORY
index 36702c1..60615b2 100644
--- a/lua-forge/lua/HISTORY
+++ b/lua-forge/lua/HISTORY
@@ -1,3 +1,7 @@
+2008-08-22 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 5.1.4
+ * PRE_BUILD: added useful comments, cleaned up
+
2008-08-16 Vlad Glagolev <stealth AT sourcemage.org>
* CONFLICTS: 'y' by default for deprecation of the old versions

diff --git a/lua-forge/lua/INSTALL b/lua-forge/lua/INSTALL
index c16f352..b671f7c 100755
--- a/lua-forge/lua/INSTALL
+++ b/lua-forge/lua/INSTALL
@@ -1,3 +1,3 @@
default_install &&

-install -m 644 etc/lua.pc $INSTALL_ROOT/usr/lib/pkgconfig
+install -vm 644 etc/lua.pc "$INSTALL_ROOT/usr/lib/pkgconfig"
diff --git a/lua-forge/lua/PRE_BUILD b/lua-forge/lua/PRE_BUILD
index 4d29c11..e2aa249 100755
--- a/lua-forge/lua/PRE_BUILD
+++ b/lua-forge/lua/PRE_BUILD
@@ -1,11 +1,17 @@
default_pre_build &&
-cd $SOURCE_DIRECTORY &&
+cd "$SOURCE_DIRECTORY" &&

-patch -p0 < $SPELL_DIRECTORY/patch-src_Makefile &&
+patch -p0 < "$SPELL_DIRECTORY/patch-src_Makefile" &&

+# build shared object
sed -i "s:liblua.a:liblua.a liblua.so.5.1:" Makefile &&
+
+# fix destdir
sed -i "s:/usr/local:$INSTALL_ROOT/usr:" etc/lua.pc src/luaconf.h Makefile &&
-sed -i "s:INSTALL_MAN=.*:INSTALL_MAN=\$\{prefix\}/share/man/man1:"
etc/lua.pc &&
-sed -i "s:INSTALL_MAN=.*:INSTALL_MAN=\$(INSTALL_TOP)/share/man/man1:"
Makefile &&
+
+# fix man-installation path
+sed -i "s:man/:share/man/:" etc/lua.pc Makefile &&
+
+# use custom compiling/linking flags
sed -i "s:^CFLAGS=.*:CFLAGS=${CFLAGS} \$(MYCFLAGS):" src/Makefile &&
sed -i "s:MYLDFLAGS=.*:MYLDFLAGS=${LDFLAGS}:" src/Makefile
diff --git a/lua-forge/lua/patch-src_Makefile
b/lua-forge/lua/patch-src_Makefile
index d98c746..3b491bc 100644
--- a/lua-forge/lua/patch-src_Makefile
+++ b/lua-forge/lua/patch-src_Makefile
@@ -1,10 +1,10 @@
---- src/Makefile.orig 2007-03-25 18:49:23.000000000 +0400
-+++ src/Makefile 2008-01-10 16:55:33.945810586 +0300
+--- src/Makefile.orig 2008-01-19 22:37:58.000000000 +0300
++++ src/Makefile 2008-08-22 19:08:36.560448176 +0400
@@ -35,8 +35,10 @@
LUAC_T= luac
LUAC_O= luac.o print.o

-+LUA_SO= liblua.so.5.1
++LUA_SO= liblua.so.5.1
+
ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (3e6c30b10a084b635abf8f084f8c197ebd3e6f6e), Vlad Glagolev, 08/22/2008

Archive powered by MHonArc 2.6.24.

Top of Page