summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--abs/extra/community/lua/PKGBUILD36
-rw-r--r--abs/extra/community/lua/lua-arch.patch2
2 files changed, 22 insertions, 16 deletions
diff --git a/abs/extra/community/lua/PKGBUILD b/abs/extra/community/lua/PKGBUILD
index ff0b435..9b30c5b 100644
--- a/abs/extra/community/lua/PKGBUILD
+++ b/abs/extra/community/lua/PKGBUILD
@@ -1,30 +1,36 @@
-# $Id: PKGBUILD 10401 2008-08-29 00:31:46Z allan $
+# $Id: PKGBUILD 86292 2010-07-28 06:43:46Z juergen $
# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
pkgname=lua
pkgver=5.1.4
-pkgrel=3
+pkgrel=6
pkgdesc="A powerful light-weight programming language designed for extending applications."
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
url="http://www.lua.org/"
depends=('readline' 'ncurses')
-license=(MIT)
+license=('MIT')
options=('!makeflags')
-source=($url/ftp/$pkgname-$pkgver.tar.gz $pkgname-arch.patch 'lua-5.1-cflags.diff')
-md5sums=('d0870f2de55d59c1c8419f36e8fac150'
- '1bd1164a19abf9165e231ba0d8a0bbc7'
- '249582bf1fd861ccf492d2c35a9fe732')
+source=(http://www.lua.org/ftp/${pkgname}-${pkgver}.tar.gz http://www.lua.org/ftp/patch-lua-5.1.4-2 lua-arch.patch lua-5.1-cflags.diff)
+md5sums=('d0870f2de55d59c1c8419f36e8fac150' '1239310e0c4a581c7831e596f95cc6cd'\
+ '6c5953f63904bf20a0183cdab05b80de' '249582bf1fd861ccf492d2c35a9fe732')
build() {
- cd $startdir/src/$pkgname-$pkgver
- patch -p1 -i $startdir/src/$pkgname-arch.patch || return 1
-
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p1 -i "${srcdir}/lua-arch.patch"
+ patch -i ${srcdir}/patch-lua-5.1.4-2 -d src
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
[ "$CARCH" == "x86_64" ] && patch -Np1 -i ../lua-5.1-cflags.diff
[ "$CARCH" == "x86_64" ] && export CFLAGS="$CFLAGS -fPIC"
- make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1" LUA_SO=liblua.so INSTALL_TOP=$startdir/pkg/usr INSTALL_MAN=$startdir/pkg/usr/share/man/man1 \
+ make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1" LUA_SO=liblua.so INSTALL_TOP="${pkgdir}/usr" INSTALL_MAN="${pkgdir}/usr/share/man/man1" \
linux install || return 1
- install -D -m 644 etc/lua.pc $startdir/pkg/usr/lib/pkgconfig/lua.pc
- install -D -m644 COPYRIGHT $startdir/pkg/usr/share/licenses/$pkgname/COPYRIGHT
+ install -D -m 644 etc/lua.pc "${pkgdir}/usr/lib/pkgconfig/lua.pc"
+ install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/COPYRIGHT"
+
+ # Install the documentation
+ mkdir -p "${pkgdir}/usr/share/doc/lua"
+ cp -R doc/* "${pkgdir}/usr/share/doc/lua"
}
-# vim: ts=2 sw=2 et ft=sh
diff --git a/abs/extra/community/lua/lua-arch.patch b/abs/extra/community/lua/lua-arch.patch
index 7d6d331..cc1f3ce 100644
--- a/abs/extra/community/lua/lua-arch.patch
+++ b/abs/extra/community/lua/lua-arch.patch
@@ -35,7 +35,7 @@ diff -ur lua-5.1.orig/src/Makefile lua-5.1/src/Makefile
$(RANLIB) $@
+$(LUA_SO): $(CORE_O) $(LIB_O)
-+ $(CC) -shared -ldl -Wl,-soname,liblua.so -o $@.5.1 $? $(MYLDFLAGS)
++ $(CC) -shared -ldl -Wl,-soname,liblua.so -o $@.5.1 $? -lm $(MYLDFLAGS)
+ ln -s $@.5.1 $@
+
$(LUA_T): $(LUA_O) $(LUA_A)