Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Andra?? Levstik (c3f326b6b8d8c9aa926b4154548ad143515100da)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Andra?? Levstik <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Andra?? Levstik (c3f326b6b8d8c9aa926b4154548ad143515100da)
  • Date: Thu, 28 Sep 2006 17:45:11 -0500

GIT changes to master grimoire by Andra?? Levstik <ruskie AT mages.ath.cx>:

devel/lua/BUILD | 3 --
devel/lua/DEPENDS | 2 +
devel/lua/DETAILS | 2 -
devel/lua/HISTORY | 10 +++++++++
devel/lua/INSTALL | 3 +-
devel/lua/PRE_BUILD | 9 +++++++-
devel/lua/lua-5.1-dynlib.patch | 42
+++++++++++++++++++++++++++++++++++++++++
7 files changed, 66 insertions(+), 5 deletions(-)

New commits:
commit bd09b3229b4a3ac490a1de76add11a487035c87c
Author: Andra?? Levstik <ruskie AT mages.ath.cx>
Commit: Andra?? Levstik <ruskie AT mages.ath.cx>

lua: get it to install liblua.so and other fixes...

diff --git a/devel/lua/BUILD b/devel/lua/BUILD
index c8fc5f6..72a63c2 100755
--- a/devel/lua/BUILD
+++ b/devel/lua/BUILD
@@ -1,2 +1 @@
-make MYCFLAGS="$CFLAGS" MYLDFLAGS="$LDFLAGS -Wl,-E" \
- LOADLIB="-DUSE_DLOPEN=1" DLLIB="-ldl" linux
+make linux
diff --git a/devel/lua/DEPENDS b/devel/lua/DEPENDS
new file mode 100755
index 0000000..71adc1a
--- /dev/null
+++ b/devel/lua/DEPENDS
@@ -0,0 +1,2 @@
+depends ncurses &&
+depends readline
diff --git a/devel/lua/DETAILS b/devel/lua/DETAILS
index 64ae41b..3e4b6ce 100755
--- a/devel/lua/DETAILS
+++ b/devel/lua/DETAILS
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL

SOURCE_HASH=sha512:8f03680a509cfc4127cb5088607f9a45a22f73b8d7413b8db290c03220328b0952e048b0b9d387472f59f2fdb23ed0e606db82be7343acaa3e389083f7ef7f2a
WEB_SITE=http://www.lua.org/
ENTERED=20020309
- PATCHLEVEL=2
+ PATCHLEVEL=3
LICENSE[0]=MIT
KEYWORDS="devel"
SHORT="Light-weight programming language"
diff --git a/devel/lua/HISTORY b/devel/lua/HISTORY
index 3c287d0..7c5dfe1 100644
--- a/devel/lua/HISTORY
+++ b/devel/lua/HISTORY
@@ -1,3 +1,13 @@
+2006-09-28 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: patchelevl++
+ * DEPENDS: addded ncurses and readline
+ * INSTALL: install the .so
+ * PRE_BUILD: apply lua-5.1-dynlib.patch to build .so
+ proper MANDIRs, proper CFLAGS
+ * lua-5.1-dynlib.patch: addde to generate .so from
+
http://cvs.mandriva.com/cgi-bin/viewvc.cgi/SPECS/lua/lua-5.1-dynlib.patch?view=markup
+ * BUILD: cleanup
+
2006-09-23 Anton Brondz <dinolinux AT sourcemage.org>
* DETAILS: updated to 5.1.1

diff --git a/devel/lua/INSTALL b/devel/lua/INSTALL
index 8d3313d..b7b930b 100755
--- a/devel/lua/INSTALL
+++ b/devel/lua/INSTALL
@@ -1,2 +1,3 @@
make INSTALL_TOP=${INSTALL_ROOT}/usr install &&
-cp etc/lua.pc ${INSTALL_ROOT}/usr/lib/pkgconfig/
+cp -v etc/lua.pc ${INSTALL_ROOT}/usr/lib/pkgconfig/ &&
+cp -rv src/liblua.so* ${INSTALL_ROOT}/usr/lib/
diff --git a/devel/lua/PRE_BUILD b/devel/lua/PRE_BUILD
index e9f3563..c2c97cf 100755
--- a/devel/lua/PRE_BUILD
+++ b/devel/lua/PRE_BUILD
@@ -1,4 +1,11 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-sed -i "s:/usr/local:$INSTALL_ROOT/usr:" etc/lua.pc
+patch -p0 < $SPELL_DIRECTORY/lua-5.1-dynlib.patch
&&
+sedit "s:/usr/local:$INSTALL_ROOT/usr:" etc/lua.pc
&&
+sedit "s:INSTALL_MAN=.*:INSTALL_MAN=\$\{prefix\}/share/man/man1:"
etc/lua.pc &&
+sedit "s:INSTALL_TOP=.*:INSTALL_TOP=$INSTALL_ROOT/usr:" Makefile
&&
+sedit "s:INSTALL_MAN=.*:INSTALL_MAN=\$(INSTALL_TOP)/share/man/man1:"
Makefile &&
+sedit "s:^CFLAGS=.*:CFLAGS=${CFLAGS} \$(MYCFLAGS):" src/Makefile
&&
+sedit "s:MYLDFLAGS=.*:MYLDFLAGS=${LDFLAGS}:" src/Makefile
+
diff --git a/devel/lua/lua-5.1-dynlib.patch b/devel/lua/lua-5.1-dynlib.patch
new file mode 100644
index 0000000..2495a14
--- /dev/null
+++ b/devel/lua/lua-5.1-dynlib.patch
@@ -0,0 +1,42 @@
+--- ./src/Makefile.dynlib 2006-03-22 01:41:49.000000000 +0100
++++ ./src/Makefile 2006-08-17 10:49:36.000000000 +0200
+@@ -22,6 +22,7 @@
+
+ PLATS= aix ansi bsd generic linux macosx mingw posix solaris
+
++LUA_SO= liblua.so.$(V)
+ LUA_A= liblua.a
+ CORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o
lmem.o \
+ lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o \
+@@ -36,7 +37,7 @@
+ LUAC_O= luac.o print.o
+
+ ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
+-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
++ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO)
+ ALL_A= $(LUA_A)
+
+ default: $(PLAT)
+@@ -51,6 +52,11 @@
+ $(AR) $@ $?
+ $(RANLIB) $@
+
++$(LUA_SO): $(CORE_O) $(LIB_O)
++ gcc -Wl,-soname=liblua.so.$(V) -shared -o $@ $(MYLDFLAGS) $? $(LIBS)
$(LUA_O)
++ rm -f liblua.so
++ ln -s $@ liblua.so
++
+ $(LUA_T): $(LUA_O) $(LUA_A)
+ $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
+
+--- ./Makefile.dynlib 2006-06-02 12:53:38.000000000 +0200
++++ ./Makefile 2006-08-17 10:47:54.000000000 +0200
+@@ -52,7 +52,7 @@
+ all: $(PLAT)
+
+ $(PLATS) clean:
+- cd src && $(MAKE) $@
++ cd src && $(MAKE) V=$(V) $@
+
+ test: dummy
+ src/lua test/hello.lua



  • [SM-Commit] GIT changes to master grimoire by Andra?? Levstik (c3f326b6b8d8c9aa926b4154548ad143515100da), Andra?? Levstik, 09/28/2006

Archive powered by MHonArc 2.6.24.

Top of Page