Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (ace693c70f6dc71d61c41eccf1c401bc0c90911e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Remko van der Vossen <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (ace693c70f6dc71d61c41eccf1c401bc0c90911e)
  • Date: Sun, 6 Jul 2014 14:02:08 -0500

GIT changes to master grimoire by Remko van der Vossen <wich AT sourcemage.org>:

lua-forge/lua/HISTORY | 3 +++
lua-forge/lua/shared.patch | 2 +-
lua-forge/lua51/HISTORY | 4 ++++
lua-forge/lua51/patch-src_Makefile | 4 ++--
4 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit ace693c70f6dc71d61c41eccf1c401bc0c90911e
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

lua: link liblua.so with libm.so

commit 38533de76a83c8ee42a13e3ac78f7695bf4445db
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

lua51: shared object not properly linked to dependencies

diff --git a/lua-forge/lua/HISTORY b/lua-forge/lua/HISTORY
index 9ebdb3e..dbfcdc8 100644
--- a/lua-forge/lua/HISTORY
+++ b/lua-forge/lua/HISTORY
@@ -1,3 +1,6 @@
+2014-07-06 Remko van der Vossen <wich AT sourcemage.org>
+ * shared.patch: link with libm.so
+
2013-12-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 5.2.3

diff --git a/lua-forge/lua/shared.patch b/lua-forge/lua/shared.patch
index fa07115..0945e01 100644
--- a/lua-forge/lua/shared.patch
+++ b/lua-forge/lua/shared.patch
@@ -17,7 +17,7 @@
$(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)

+$(LUA_SO): $(CORE_O) $(LIB_O)
-+ $(CC) -o $@ -shared $(LDFLAGS) $(CORE_O) $(LIB_O) -ldl
++ $(CC) -o $@ -shared $(LDFLAGS) $(CORE_O) $(LIB_O) -lm -ldl
+
clean:
$(RM) $(ALL_T) $(ALL_O)
diff --git a/lua-forge/lua51/HISTORY b/lua-forge/lua51/HISTORY
index a15ba61..218a311 100644
--- a/lua-forge/lua51/HISTORY
+++ b/lua-forge/lua51/HISTORY
@@ -1,3 +1,7 @@
+2014-07-06 Remko van der Vossen <wich AT sourcemage.org>
+ * patch-src_Makefile: shared object was not linked
+ to libraries properly
+
2013-02-17 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 5.1.5
* PRE_BUILD: changed to add the -lm -ldl to LDFLAGS
diff --git a/lua-forge/lua51/patch-src_Makefile
b/lua-forge/lua51/patch-src_Makefile
index 7ecea06..5de88ce 100644
--- a/lua-forge/lua51/patch-src_Makefile
+++ b/lua-forge/lua51/patch-src_Makefile
@@ -7,7 +7,7 @@ diff -ur lua-5.1.5/src/Makefile lua-mod/src/Makefile
MYCFLAGS=
-MYLDFLAGS=
-MYLIBS=
-+MYLDFLAGS= -lm -ldl
++MYLDFLAGS=
+MYLIBS= -ldl

# == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE
=========
@@ -29,7 +29,7 @@ diff -ur lua-5.1.5/src/Makefile lua-mod/src/Makefile
$(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)

+$(LUA_SO): $(CORE_O) $(LIB_O)
-+ $(CC) -o $@ -shared $(MYLDFLAGS) $(CORE_O) $(LIB_O)
++ $(CC) -o $@ -shared $(MYLDFLAGS) $(CORE_O) $(LIB_O) $(LIBS)
+
clean:
$(RM) $(ALL_T) $(ALL_O)



  • [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (ace693c70f6dc71d61c41eccf1c401bc0c90911e), Remko van der Vossen, 07/06/2014

Archive powered by MHonArc 2.6.24.

Top of Page