Date: Tuesday, April 10, 2012 @ 15:56:22
Author: bluewind
Revision: 155986
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
lua/repos/testing-i686/
lua/repos/testing-i686/PKGBUILD
(from rev 155985, lua/trunk/PKGBUILD)
lua/repos/testing-i686/lua-5.1-cflags.diff
(from rev 155985, lua/trunk/lua-5.1-cflags.diff)
lua/repos/testing-i686/lua-arch.patch
(from rev 155985, lua/trunk/lua-arch.patch)
lua/repos/testing-x86_64/
lua/repos/testing-x86_64/PKGBUILD
(from rev 155985, lua/trunk/PKGBUILD)
lua/repos/testing-x86_64/lua-5.1-cflags.diff
(from rev 155985, lua/trunk/lua-5.1-cflags.diff)
lua/repos/testing-x86_64/lua-arch.patch
(from rev 155985, lua/trunk/lua-arch.patch)
------------------------------------+
testing-i686/PKGBUILD | 42 ++++++++++++++++++++++
testing-i686/lua-5.1-cflags.diff | 13 ++++++
testing-i686/lua-arch.patch | 66 +++++++++++++++++++++++++++++++++++
testing-x86_64/PKGBUILD | 42 ++++++++++++++++++++++
testing-x86_64/lua-5.1-cflags.diff | 13 ++++++
testing-x86_64/lua-arch.patch | 66 +++++++++++++++++++++++++++++++++++
6 files changed, 242 insertions(+)
Copied: lua/repos/testing-i686/PKGBUILD (from rev 155985, lua/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-04-10 19:56:22 UTC (rev 155986)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Juergen Hoetzel <juer...@archlinux.org>
+# Contributor: Damir Perisa <damir.per...@bluewin.ch>
+
+pkgname=lua
+pkgver=5.1.5
+pkgrel=2
+pkgdesc="A powerful light-weight programming language designed for extending
applications"
+arch=('i686' 'x86_64')
+url="http://www.lua.org/";
+depends=('readline')
+license=('MIT')
+options=('!makeflags' '!emptydirs')
+source=(http://www.lua.org/ftp/${pkgname}-${pkgver}.tar.gz
+ lua-arch.patch lua-5.1-cflags.diff)
+md5sums=('2e115fe26e435e33b0d5c022e4490567'
+ 'fa25feb70ef9fec975b1c20da5098b3c'
+ '249582bf1fd861ccf492d2c35a9fe732')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p1 -i "${srcdir}/lua-arch.patch"
+ patch -p1 -i "${srcdir}/lua-5.1-cflags.diff"
+ export CFLAGS="$CFLAGS -fPIC"
+
+ make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1" \
+ INSTALL_TOP="${pkgdir}/usr" INSTALL_MAN="${pkgdir}/usr/share/man/man1" \
+ linux
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1
liblua.so.$pkgver" \
+ INSTALL_TOP="${pkgdir}/usr" INSTALL_MAN="${pkgdir}/usr/share/man/man1" \
+ install
+ install -D -m644 etc/lua.pc "${pkgdir}/usr/lib/pkgconfig/lua.pc"
+ install -D -m644 COPYRIGHT
"${pkgdir}/usr/share/licenses/${pkgname}/COPYRIGHT"
+
+ # Install the documentation
+ install -d "${pkgdir}/usr/share/doc/lua"
+ install -m644 doc/*.{gif,png,css,html} "${pkgdir}/usr/share/doc/lua"
+}
Copied: lua/repos/testing-i686/lua-5.1-cflags.diff (from rev 155985,
lua/trunk/lua-5.1-cflags.diff)
===================================================================
--- testing-i686/lua-5.1-cflags.diff (rev 0)
+++ testing-i686/lua-5.1-cflags.diff 2012-04-10 19:56:22 UTC (rev 155986)
@@ -0,0 +1,13 @@
+diff -Naur lua-5.1.orig/src/Makefile lua-5.1/src/Makefile
+--- lua-5.1.orig/src/Makefile 2006-02-16 16:45:09.000000000 +0100
++++ lua-5.1/src/Makefile 2006-03-01 14:55:29.000000000 +0100
+@@ -8,7 +8,8 @@
+ PLAT= none
+
+ CC= gcc
+-CFLAGS= -O2 -Wall $(MYCFLAGS)
++CFLAGS ?= -O2 -Wall
++CFLAGS += $(MYCFLAGS)
+ AR= ar rcu
+ RANLIB= ranlib
+ RM= rm -f
Copied: lua/repos/testing-i686/lua-arch.patch (from rev 155985,
lua/trunk/lua-arch.patch)
===================================================================
--- testing-i686/lua-arch.patch (rev 0)
+++ testing-i686/lua-arch.patch 2012-04-10 19:56:22 UTC (rev 155986)
@@ -0,0 +1,66 @@
+diff -ur lua-5.1.4/etc/lua.pc lua-5.1.4-new/etc/lua.pc
+--- lua-5.1.4/etc/lua.pc 2008-08-08 14:46:11.000000000 +0200
++++ lua-5.1.4-new/etc/lua.pc 2012-02-23 18:25:34.000000000 +0100
+@@ -8,6 +8,6 @@
+
+ # grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
+-prefix= /usr/local
++prefix= /usr
+ INSTALL_BIN= ${prefix}/bin
+ INSTALL_INC= ${prefix}/include
+ INSTALL_LIB= ${prefix}/lib
+diff -ur lua-5.1.4/src/luaconf.h lua-5.1.4-new/src/luaconf.h
+--- lua-5.1.4/src/luaconf.h 2008-02-11 17:25:08.000000000 +0100
++++ lua-5.1.4-new/src/luaconf.h 2012-02-23 18:25:34.000000000 +0100
+@@ -94,7 +94,7 @@
+ ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
+
+ #else
+-#define LUA_ROOT "/usr/local/"
++#define LUA_ROOT "/usr/"
+ #define LUA_LDIR LUA_ROOT "share/lua/5.1/"
+ #define LUA_CDIR LUA_ROOT "lib/lua/5.1/"
+ #define LUA_PATH_DEFAULT \
+diff -ur lua-5.1.4/src/Makefile lua-5.1.4-new/src/Makefile
+--- lua-5.1.4/src/Makefile 2008-01-19 20:37:58.000000000 +0100
++++ lua-5.1.4-new/src/Makefile 2012-02-23 18:26:43.000000000 +0100
+@@ -23,6 +23,7 @@
+ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
+
+ LUA_A= liblua.a
++LUA_SO= liblua.so
+ 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 \
+ lundump.o lvm.o lzio.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_SO) $(LUA_T) $(LUAC_T)
+ ALL_A= $(LUA_A)
+
+ default: $(PLAT)
+@@ -51,6 +52,11 @@
+ $(AR) $@ $?
+ $(RANLIB) $@
+
++$(LUA_SO): $(CORE_O) $(LIB_O)
++ $(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm
$(MYLDFLAGS)
++ ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V)
++ ln -sf $(LUA_SO).$(R) $(LUA_SO)
++
+ $(LUA_T): $(LUA_O) $(LUA_A)
+ $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
+
+--- lua-5.1.4/Makefile 2008-08-12 02:40:48.000000000 +0200
++++ lua-5.1.4-new/Makefile 2012-02-23 19:06:32.000000000 +0100
+@@ -53,7 +53,7 @@
+ all: $(PLAT)
+
+ $(PLATS) clean:
+- cd src && $(MAKE) $@
++ cd src && $(MAKE) $@ V=$(V) R=$(R)
+
+ test: dummy
+ src/lua test/hello.lua
Copied: lua/repos/testing-x86_64/PKGBUILD (from rev 155985, lua/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2012-04-10 19:56:22 UTC (rev 155986)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Juergen Hoetzel <juer...@archlinux.org>
+# Contributor: Damir Perisa <damir.per...@bluewin.ch>
+
+pkgname=lua
+pkgver=5.1.5
+pkgrel=2
+pkgdesc="A powerful light-weight programming language designed for extending
applications"
+arch=('i686' 'x86_64')
+url="http://www.lua.org/";
+depends=('readline')
+license=('MIT')
+options=('!makeflags' '!emptydirs')
+source=(http://www.lua.org/ftp/${pkgname}-${pkgver}.tar.gz
+ lua-arch.patch lua-5.1-cflags.diff)
+md5sums=('2e115fe26e435e33b0d5c022e4490567'
+ 'fa25feb70ef9fec975b1c20da5098b3c'
+ '249582bf1fd861ccf492d2c35a9fe732')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p1 -i "${srcdir}/lua-arch.patch"
+ patch -p1 -i "${srcdir}/lua-5.1-cflags.diff"
+ export CFLAGS="$CFLAGS -fPIC"
+
+ make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1" \
+ INSTALL_TOP="${pkgdir}/usr" INSTALL_MAN="${pkgdir}/usr/share/man/man1" \
+ linux
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1
liblua.so.$pkgver" \
+ INSTALL_TOP="${pkgdir}/usr" INSTALL_MAN="${pkgdir}/usr/share/man/man1" \
+ install
+ install -D -m644 etc/lua.pc "${pkgdir}/usr/lib/pkgconfig/lua.pc"
+ install -D -m644 COPYRIGHT
"${pkgdir}/usr/share/licenses/${pkgname}/COPYRIGHT"
+
+ # Install the documentation
+ install -d "${pkgdir}/usr/share/doc/lua"
+ install -m644 doc/*.{gif,png,css,html} "${pkgdir}/usr/share/doc/lua"
+}
Copied: lua/repos/testing-x86_64/lua-5.1-cflags.diff (from rev 155985,
lua/trunk/lua-5.1-cflags.diff)
===================================================================
--- testing-x86_64/lua-5.1-cflags.diff (rev 0)
+++ testing-x86_64/lua-5.1-cflags.diff 2012-04-10 19:56:22 UTC (rev 155986)
@@ -0,0 +1,13 @@
+diff -Naur lua-5.1.orig/src/Makefile lua-5.1/src/Makefile
+--- lua-5.1.orig/src/Makefile 2006-02-16 16:45:09.000000000 +0100
++++ lua-5.1/src/Makefile 2006-03-01 14:55:29.000000000 +0100
+@@ -8,7 +8,8 @@
+ PLAT= none
+
+ CC= gcc
+-CFLAGS= -O2 -Wall $(MYCFLAGS)
++CFLAGS ?= -O2 -Wall
++CFLAGS += $(MYCFLAGS)
+ AR= ar rcu
+ RANLIB= ranlib
+ RM= rm -f
Copied: lua/repos/testing-x86_64/lua-arch.patch (from rev 155985,
lua/trunk/lua-arch.patch)
===================================================================
--- testing-x86_64/lua-arch.patch (rev 0)
+++ testing-x86_64/lua-arch.patch 2012-04-10 19:56:22 UTC (rev 155986)
@@ -0,0 +1,66 @@
+diff -ur lua-5.1.4/etc/lua.pc lua-5.1.4-new/etc/lua.pc
+--- lua-5.1.4/etc/lua.pc 2008-08-08 14:46:11.000000000 +0200
++++ lua-5.1.4-new/etc/lua.pc 2012-02-23 18:25:34.000000000 +0100
+@@ -8,6 +8,6 @@
+
+ # grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
+-prefix= /usr/local
++prefix= /usr
+ INSTALL_BIN= ${prefix}/bin
+ INSTALL_INC= ${prefix}/include
+ INSTALL_LIB= ${prefix}/lib
+diff -ur lua-5.1.4/src/luaconf.h lua-5.1.4-new/src/luaconf.h
+--- lua-5.1.4/src/luaconf.h 2008-02-11 17:25:08.000000000 +0100
++++ lua-5.1.4-new/src/luaconf.h 2012-02-23 18:25:34.000000000 +0100
+@@ -94,7 +94,7 @@
+ ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
+
+ #else
+-#define LUA_ROOT "/usr/local/"
++#define LUA_ROOT "/usr/"
+ #define LUA_LDIR LUA_ROOT "share/lua/5.1/"
+ #define LUA_CDIR LUA_ROOT "lib/lua/5.1/"
+ #define LUA_PATH_DEFAULT \
+diff -ur lua-5.1.4/src/Makefile lua-5.1.4-new/src/Makefile
+--- lua-5.1.4/src/Makefile 2008-01-19 20:37:58.000000000 +0100
++++ lua-5.1.4-new/src/Makefile 2012-02-23 18:26:43.000000000 +0100
+@@ -23,6 +23,7 @@
+ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
+
+ LUA_A= liblua.a
++LUA_SO= liblua.so
+ 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 \
+ lundump.o lvm.o lzio.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_SO) $(LUA_T) $(LUAC_T)
+ ALL_A= $(LUA_A)
+
+ default: $(PLAT)
+@@ -51,6 +52,11 @@
+ $(AR) $@ $?
+ $(RANLIB) $@
+
++$(LUA_SO): $(CORE_O) $(LIB_O)
++ $(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm
$(MYLDFLAGS)
++ ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V)
++ ln -sf $(LUA_SO).$(R) $(LUA_SO)
++
+ $(LUA_T): $(LUA_O) $(LUA_A)
+ $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
+
+--- lua-5.1.4/Makefile 2008-08-12 02:40:48.000000000 +0200
++++ lua-5.1.4-new/Makefile 2012-02-23 19:06:32.000000000 +0100
+@@ -53,7 +53,7 @@
+ all: $(PLAT)
+
+ $(PLATS) clean:
+- cd src && $(MAKE) $@
++ cd src && $(MAKE) $@ V=$(V) R=$(R)
+
+ test: dummy
+ src/lua test/hello.lua
