[arch-commits] Commit in lua/repos (6 files)
Allan McRae
allan at archlinux.org
Mon Nov 12 08:49:40 UTC 2012
Date: Monday, November 12, 2012 @ 03:49:40
Author: allan
Revision: 170824
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
lua/repos/staging-i686/
lua/repos/staging-i686/PKGBUILD
(from rev 170823, lua/trunk/PKGBUILD)
lua/repos/staging-i686/liblua.so.patch
(from rev 170823, lua/trunk/liblua.so.patch)
lua/repos/staging-x86_64/
lua/repos/staging-x86_64/PKGBUILD
(from rev 170823, lua/trunk/PKGBUILD)
lua/repos/staging-x86_64/liblua.so.patch
(from rev 170823, lua/trunk/liblua.so.patch)
--------------------------------+
staging-i686/PKGBUILD | 40 +++++++++++++++++++++++++++
staging-i686/liblua.so.patch | 57 +++++++++++++++++++++++++++++++++++++++
staging-x86_64/PKGBUILD | 40 +++++++++++++++++++++++++++
staging-x86_64/liblua.so.patch | 57 +++++++++++++++++++++++++++++++++++++++
4 files changed, 194 insertions(+)
Copied: lua/repos/staging-i686/PKGBUILD (from rev 170823, lua/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-11-12 08:49:40 UTC (rev 170824)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Sébastien Luttringer <seblu at archlinux.org>
+# Contributor: Juergen Hoetzel <juergen at archlinux.org>
+# Contributor: Damir Perisa <damir.perisa at bluewin.ch>
+
+pkgname=lua
+pkgver=5.2.1
+pkgrel=1
+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"
+ 'liblua.so.patch')
+md5sums=('ae08f641b45d737d12d30291a5e5f6e3'
+ 'bdc663c7b82ffc0b5df67611621fb625')
+
+build() {
+ cd $pkgname-$pkgver
+ patch -p1 -i "$srcdir/liblua.so.patch"
+ [[ $CARCH == x86_64 ]] && export CFLAGS="$CFLAGS -fPIC"
+ make MYCFLAGS="$CFLAGS" MYLDFLAGS="$LDFLAGS" linux
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make \
+ TO_LIB="liblua.a liblua.so liblua.so.5.2 liblua.so.$pkgver" \
+ INSTALL_DATA="cp -d" \
+ INSTALL_TOP="$pkgdir/usr" \
+ INSTALL_MAN="$pkgdir/usr/share/man/man1" \
+ install
+ # Install the documentation
+ install -d "$pkgdir/usr/share/doc/lua"
+ install -m644 doc/*.{gif,png,css,html} "$pkgdir/usr/share/doc/lua"
+}
+
+# vim:set ts=4 sw=4 et:
Copied: lua/repos/staging-i686/liblua.so.patch (from rev 170823, lua/trunk/liblua.so.patch)
===================================================================
--- staging-i686/liblua.so.patch (rev 0)
+++ staging-i686/liblua.so.patch 2012-11-12 08:49:40 UTC (rev 170824)
@@ -0,0 +1,57 @@
+diff -ru lua-5.2.1/Makefile lua-5.2.1.new/Makefile
+--- lua-5.2.1/Makefile 2012-05-17 16:05:54.000000000 +0200
++++ lua-5.2.1.new/Makefile 2012-09-12 22:39:07.162748096 +0200
+@@ -52,7 +52,7 @@
+ all: $(PLAT)
+
+ $(PLATS) clean:
+- cd src && $(MAKE) $@
++ cd src && $(MAKE) $@ V=$(V) R=$(R)
+
+ test: dummy
+ src/lua -v
+diff -ru lua-5.2.1/src/luaconf.h lua-5.2.1.new/src/luaconf.h
+--- lua-5.2.1/src/luaconf.h 2012-05-11 16:14:42.000000000 +0200
++++ lua-5.2.1.new/src/luaconf.h 2012-09-12 22:40:27.986622772 +0200
+@@ -100,7 +100,7 @@
+ #else /* }{ */
+
+ #define LUA_VDIR LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/"
+-#define LUA_ROOT "/usr/local/"
++#define LUA_ROOT "/usr/"
+ #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR
+ #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR
+ #define LUA_PATH_DEFAULT \
+diff -ru lua-5.2.1/src/Makefile lua-5.2.1.new/src/Makefile
+--- lua-5.2.1/src/Makefile 2012-03-09 17:32:16.000000000 +0100
++++ lua-5.2.1.new/src/Makefile 2012-09-12 22:38:08.591386896 +0200
+@@ -29,6 +29,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 lctype.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
+@@ -43,7 +44,7 @@
+ LUAC_O= luac.o
+
+ ALL_O= $(BASE_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)
+
+ # Targets start here.
+@@ -59,6 +60,12 @@
+ $(AR) $@ $(BASE_O)
+ $(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 $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
+
Copied: lua/repos/staging-x86_64/PKGBUILD (from rev 170823, lua/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-11-12 08:49:40 UTC (rev 170824)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Sébastien Luttringer <seblu at archlinux.org>
+# Contributor: Juergen Hoetzel <juergen at archlinux.org>
+# Contributor: Damir Perisa <damir.perisa at bluewin.ch>
+
+pkgname=lua
+pkgver=5.2.1
+pkgrel=1
+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"
+ 'liblua.so.patch')
+md5sums=('ae08f641b45d737d12d30291a5e5f6e3'
+ 'bdc663c7b82ffc0b5df67611621fb625')
+
+build() {
+ cd $pkgname-$pkgver
+ patch -p1 -i "$srcdir/liblua.so.patch"
+ [[ $CARCH == x86_64 ]] && export CFLAGS="$CFLAGS -fPIC"
+ make MYCFLAGS="$CFLAGS" MYLDFLAGS="$LDFLAGS" linux
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make \
+ TO_LIB="liblua.a liblua.so liblua.so.5.2 liblua.so.$pkgver" \
+ INSTALL_DATA="cp -d" \
+ INSTALL_TOP="$pkgdir/usr" \
+ INSTALL_MAN="$pkgdir/usr/share/man/man1" \
+ install
+ # Install the documentation
+ install -d "$pkgdir/usr/share/doc/lua"
+ install -m644 doc/*.{gif,png,css,html} "$pkgdir/usr/share/doc/lua"
+}
+
+# vim:set ts=4 sw=4 et:
Copied: lua/repos/staging-x86_64/liblua.so.patch (from rev 170823, lua/trunk/liblua.so.patch)
===================================================================
--- staging-x86_64/liblua.so.patch (rev 0)
+++ staging-x86_64/liblua.so.patch 2012-11-12 08:49:40 UTC (rev 170824)
@@ -0,0 +1,57 @@
+diff -ru lua-5.2.1/Makefile lua-5.2.1.new/Makefile
+--- lua-5.2.1/Makefile 2012-05-17 16:05:54.000000000 +0200
++++ lua-5.2.1.new/Makefile 2012-09-12 22:39:07.162748096 +0200
+@@ -52,7 +52,7 @@
+ all: $(PLAT)
+
+ $(PLATS) clean:
+- cd src && $(MAKE) $@
++ cd src && $(MAKE) $@ V=$(V) R=$(R)
+
+ test: dummy
+ src/lua -v
+diff -ru lua-5.2.1/src/luaconf.h lua-5.2.1.new/src/luaconf.h
+--- lua-5.2.1/src/luaconf.h 2012-05-11 16:14:42.000000000 +0200
++++ lua-5.2.1.new/src/luaconf.h 2012-09-12 22:40:27.986622772 +0200
+@@ -100,7 +100,7 @@
+ #else /* }{ */
+
+ #define LUA_VDIR LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/"
+-#define LUA_ROOT "/usr/local/"
++#define LUA_ROOT "/usr/"
+ #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR
+ #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR
+ #define LUA_PATH_DEFAULT \
+diff -ru lua-5.2.1/src/Makefile lua-5.2.1.new/src/Makefile
+--- lua-5.2.1/src/Makefile 2012-03-09 17:32:16.000000000 +0100
++++ lua-5.2.1.new/src/Makefile 2012-09-12 22:38:08.591386896 +0200
+@@ -29,6 +29,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 lctype.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
+@@ -43,7 +44,7 @@
+ LUAC_O= luac.o
+
+ ALL_O= $(BASE_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)
+
+ # Targets start here.
+@@ -59,6 +60,12 @@
+ $(AR) $@ $(BASE_O)
+ $(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 $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
+
More information about the arch-commits
mailing list