Skip to Content.
Sympa Menu

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

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 (590c5c8279089f8e1937ce4a41412f8ca5a06e70)
  • Date: Thu, 22 Jul 2010 06:41:07 -0500

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

lua-forge/luafilesystem/BUILD | 2 +-
lua-forge/luafilesystem/HISTORY | 6 ++++++
lua-forge/luafilesystem/INSTALL | 1 +
lua-forge/luafilesystem/PRE_BUILD | 2 +-
lua-forge/luafilesystem/config.patch | 21 +++++++++++++++++++++
lua-forge/luasocket/BUILD | 2 +-
lua-forge/luasocket/HISTORY | 4 ++++
lua-forge/luasocket/PRE_BUILD | 4 +++-
lua-forge/luasocket/config.patch | 13 +++++++++++++
9 files changed, 51 insertions(+), 4 deletions(-)

New commits:
commit 590c5c8279089f8e1937ce4a41412f8ca5a06e70
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

luafilesystem: user-defined flags OK

commit 2deec638a3787d1fa7de0195349532dee41f5df0
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

luasocket: user-defined flags OK

diff --git a/lua-forge/luafilesystem/BUILD b/lua-forge/luafilesystem/BUILD
index 8f58e6d..f4ab756 100755
--- a/lua-forge/luafilesystem/BUILD
+++ b/lua-forge/luafilesystem/BUILD
@@ -1 +1 @@
-make
+make PREFIX="$INSTALL_ROOT/usr" MYCFLAGS="$CFLAGS" MYLDFLAGS="$LDFLAGS"
diff --git a/lua-forge/luafilesystem/HISTORY b/lua-forge/luafilesystem/HISTORY
index 47e0681..8e83ce3 100644
--- a/lua-forge/luafilesystem/HISTORY
+++ b/lua-forge/luafilesystem/HISTORY
@@ -1,3 +1,9 @@
+2010-07-22 Vlad Glagolev <stealth AT sourcemage.org>
+ * BUILD: use custom flags
+ * PRE_BUILD: apply the patch
+ * INSTALL: added, to use correct prefix
+ * config.patch: added, to use custom flags
+
2010-05-08 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.5.0; renewed source url

diff --git a/lua-forge/luafilesystem/INSTALL b/lua-forge/luafilesystem/INSTALL
new file mode 100755
index 0000000..f1b6bc6
--- /dev/null
+++ b/lua-forge/luafilesystem/INSTALL
@@ -0,0 +1 @@
+make install PREFIX="$INSTALL_ROOT/usr"
diff --git a/lua-forge/luafilesystem/PRE_BUILD
b/lua-forge/luafilesystem/PRE_BUILD
index 9fbecb2..984ae79 100755
--- a/lua-forge/luafilesystem/PRE_BUILD
+++ b/lua-forge/luafilesystem/PRE_BUILD
@@ -1,4 +1,4 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

-sed -i "s:/usr/local:$INSTALL_ROOT/usr:g" config
+patch -p0 < "$SPELL_DIRECTORY/config.patch"
diff --git a/lua-forge/luafilesystem/config.patch
b/lua-forge/luafilesystem/config.patch
new file mode 100644
index 0000000..11039e8
--- /dev/null
+++ b/lua-forge/luafilesystem/config.patch
@@ -0,0 +1,21 @@
+--- config.orig 2009-10-21 00:54:35.000000000 +0400
++++ config 2010-07-22 15:31:41.711205070 +0400
+@@ -10,15 +10,15 @@
+ LUA_INC= $(PREFIX)/include
+
+ # OS dependent
+-LIB_OPTION= -shared #for Linux
++LIB_OPTION= -shared $(MYLDFLAGS) #for Linux
+ #LIB_OPTION= -bundle -undefined dynamic_lookup #for MacOS X
+
+ LIBNAME= $T.so.$V
+
+ # Compilation directives
+-WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align
-Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings -pedantic
++WARN= -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes
-Wnested-externs -Wshadow -Wwrite-strings
+ INCS= -I$(LUA_INC)
+-CFLAGS= $(WARN) $(INCS)
++CFLAGS= $(WARN) $(INCS) $(MYCFLAGS)
+ CC= gcc
+
+ # $Id: config,v 1.21 2007/10/27 22:42:32 carregal Exp $
diff --git a/lua-forge/luasocket/BUILD b/lua-forge/luasocket/BUILD
index 8f58e6d..dd11cad 100755
--- a/lua-forge/luasocket/BUILD
+++ b/lua-forge/luasocket/BUILD
@@ -1 +1 @@
-make
+make MYCFLAGS="$CFLAGS" MYLDFLAGS="$LDFLAGS"
diff --git a/lua-forge/luasocket/HISTORY b/lua-forge/luasocket/HISTORY
index 2f25079..0ceb991 100644
--- a/lua-forge/luasocket/HISTORY
+++ b/lua-forge/luasocket/HISTORY
@@ -1,2 +1,6 @@
+2010-07-22 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: apply the patch
+ * config.patch: added, to use custom flags
+
2008-01-10 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS, DETAILS, BUILD, PRE_BUILD: spell created
diff --git a/lua-forge/luasocket/PRE_BUILD b/lua-forge/luasocket/PRE_BUILD
index 7626d9e..969c228 100755
--- a/lua-forge/luasocket/PRE_BUILD
+++ b/lua-forge/luasocket/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

-sed -i "s:5.0:5.1:g;s:500:501:g;s:/usr/local:$INSTALL_ROOT/usr:" config
+patch -p0 < "$SPELL_DIRECTORY/config.patch" &&
+
+sed -i "s:/usr/local:$INSTALL_ROOT/usr:" config
diff --git a/lua-forge/luasocket/config.patch
b/lua-forge/luasocket/config.patch
new file mode 100644
index 0000000..8fbec28
--- /dev/null
+++ b/lua-forge/luasocket/config.patch
@@ -0,0 +1,13 @@
+--- config.orig 2007-10-15 08:21:05.000000000 +0400
++++ config 2010-07-22 15:23:27.219208495 +0400
+@@ -51,8 +51,8 @@
+ # for Linux
+ CC=gcc
+ DEF=-DLUASOCKET_DEBUG
+-CFLAGS= $(LUAINC) $(DEF) -pedantic -Wall -O2 -fpic
+-LDFLAGS=-O -shared -fpic
++CFLAGS= $(LUAINC) $(DEF) $(MYCFLAGS) -fpic
++LDFLAGS=-O -shared -fpic $(MYLDFLAGS)
+ LD=gcc
+
+ #------



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (590c5c8279089f8e1937ce4a41412f8ca5a06e70), Vlad Glagolev, 07/22/2010

Archive powered by MHonArc 2.6.24.

Top of Page