[arch-commits] Commit in lua51/repos (8 files)

Evangelos Foutras foutrelis at archlinux.org
Sun Nov 6 20:05:54 UTC 2016


    Date: Sunday, November 6, 2016 @ 20:05:54
  Author: foutrelis
Revision: 279949

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  lua51/repos/staging-i686/
  lua51/repos/staging-i686/PKGBUILD
    (from rev 279948, lua51/trunk/PKGBUILD)
  lua51/repos/staging-i686/lua-5.1-cflags.diff
    (from rev 279948, lua51/trunk/lua-5.1-cflags.diff)
  lua51/repos/staging-i686/lua-arch.patch
    (from rev 279948, lua51/trunk/lua-arch.patch)
  lua51/repos/staging-x86_64/
  lua51/repos/staging-x86_64/PKGBUILD
    (from rev 279948, lua51/trunk/PKGBUILD)
  lua51/repos/staging-x86_64/lua-5.1-cflags.diff
    (from rev 279948, lua51/trunk/lua-5.1-cflags.diff)
  lua51/repos/staging-x86_64/lua-arch.patch
    (from rev 279948, lua51/trunk/lua-arch.patch)

------------------------------------+
 staging-i686/PKGBUILD              |   61 ++++++++++++++++++++++++++++++++
 staging-i686/lua-5.1-cflags.diff   |   13 ++++++
 staging-i686/lua-arch.patch        |   66 +++++++++++++++++++++++++++++++++++
 staging-x86_64/PKGBUILD            |   61 ++++++++++++++++++++++++++++++++
 staging-x86_64/lua-5.1-cflags.diff |   13 ++++++
 staging-x86_64/lua-arch.patch      |   66 +++++++++++++++++++++++++++++++++++
 6 files changed, 280 insertions(+)

Copied: lua51/repos/staging-i686/PKGBUILD (from rev 279948, lua51/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2016-11-06 20:05:54 UTC (rev 279949)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Sébastien Luttringer <seblu at aur.archlinux.org>
+# Contributor: Juergen Hoetzel <juergen at archlinux.org>
+# Contributor: Damir Perisa <damir.perisa at bluewin.ch>
+
+pkgname=lua51
+pkgver=5.1.5
+pkgrel=6
+pkgdesc='Powerful lightweight 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/lua-$pkgver.tar.gz
+        lua-arch.patch
+        lua-5.1-cflags.diff)
+md5sums=('2e115fe26e435e33b0d5c022e4490567'
+         'fa25feb70ef9fec975b1c20da5098b3c'
+         '249582bf1fd861ccf492d2c35a9fe732')
+
+prepare() {
+  cd lua-$pkgver
+  patch -p1 -i ../lua-arch.patch
+  patch -p1 -i ../lua-5.1-cflags.diff
+
+  sed -e 's:llua:llua5.1:' -e 's:/include:/include/lua5.1:' -i etc/lua.pc
+  sed -r -e '/^LUA_(SO|A|T)=/ s/lua/lua5.1/' -e '/^LUAC_T=/ s/luac/luac5.1/' -i src/Makefile
+}
+
+build() {
+  cd lua-$pkgver
+
+  [[ $CARCH == x86_64 ]] && export CFLAGS="$CFLAGS -fPIC"
+  make MYCFLAGS="$CFLAGS" MYLDFLAGS="$LDFLAGS" linux
+}
+
+package() {
+  cd lua-$pkgver
+
+  make \
+    TO_BIN='lua5.1 luac5.1' \
+    TO_LIB="liblua5.1.a liblua5.1.so liblua5.1.so.5.1 liblua5.1.so.$pkgver" \
+    INSTALL_DATA='cp -d' \
+    INSTALL_TOP="$pkgdir"/usr \
+    INSTALL_INC="$pkgdir"/usr/include/lua5.1 \
+    INSTALL_MAN="$pkgdir"/usr/share/man/man1 \
+    install
+
+  install -Dm644 etc/lua.pc "$pkgdir"/usr/lib/pkgconfig/$pkgname.pc
+  install -d "$pkgdir"/usr/share/doc/$pkgname
+  install -m644 doc/*.{gif,png,css,html} "$pkgdir"/usr/share/doc/$pkgname
+  install -Dm644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/COPYRIGHT
+
+  ln -s liblua5.1.so "$pkgdir"/usr/lib/liblua.so.5.1
+  ln -s liblua5.1.so "$pkgdir"/usr/lib/liblua.so.$pkgver
+
+  cd "$pkgdir"/usr/share/man/man1
+  mv lua.1 lua5.1.1
+  mv luac.1 luac5.1.1
+}

Copied: lua51/repos/staging-i686/lua-5.1-cflags.diff (from rev 279948, lua51/trunk/lua-5.1-cflags.diff)
===================================================================
--- staging-i686/lua-5.1-cflags.diff	                        (rev 0)
+++ staging-i686/lua-5.1-cflags.diff	2016-11-06 20:05:54 UTC (rev 279949)
@@ -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: lua51/repos/staging-i686/lua-arch.patch (from rev 279948, lua51/trunk/lua-arch.patch)
===================================================================
--- staging-i686/lua-arch.patch	                        (rev 0)
+++ staging-i686/lua-arch.patch	2016-11-06 20:05:54 UTC (rev 279949)
@@ -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: lua51/repos/staging-x86_64/PKGBUILD (from rev 279948, lua51/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2016-11-06 20:05:54 UTC (rev 279949)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Sébastien Luttringer <seblu at aur.archlinux.org>
+# Contributor: Juergen Hoetzel <juergen at archlinux.org>
+# Contributor: Damir Perisa <damir.perisa at bluewin.ch>
+
+pkgname=lua51
+pkgver=5.1.5
+pkgrel=6
+pkgdesc='Powerful lightweight 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/lua-$pkgver.tar.gz
+        lua-arch.patch
+        lua-5.1-cflags.diff)
+md5sums=('2e115fe26e435e33b0d5c022e4490567'
+         'fa25feb70ef9fec975b1c20da5098b3c'
+         '249582bf1fd861ccf492d2c35a9fe732')
+
+prepare() {
+  cd lua-$pkgver
+  patch -p1 -i ../lua-arch.patch
+  patch -p1 -i ../lua-5.1-cflags.diff
+
+  sed -e 's:llua:llua5.1:' -e 's:/include:/include/lua5.1:' -i etc/lua.pc
+  sed -r -e '/^LUA_(SO|A|T)=/ s/lua/lua5.1/' -e '/^LUAC_T=/ s/luac/luac5.1/' -i src/Makefile
+}
+
+build() {
+  cd lua-$pkgver
+
+  [[ $CARCH == x86_64 ]] && export CFLAGS="$CFLAGS -fPIC"
+  make MYCFLAGS="$CFLAGS" MYLDFLAGS="$LDFLAGS" linux
+}
+
+package() {
+  cd lua-$pkgver
+
+  make \
+    TO_BIN='lua5.1 luac5.1' \
+    TO_LIB="liblua5.1.a liblua5.1.so liblua5.1.so.5.1 liblua5.1.so.$pkgver" \
+    INSTALL_DATA='cp -d' \
+    INSTALL_TOP="$pkgdir"/usr \
+    INSTALL_INC="$pkgdir"/usr/include/lua5.1 \
+    INSTALL_MAN="$pkgdir"/usr/share/man/man1 \
+    install
+
+  install -Dm644 etc/lua.pc "$pkgdir"/usr/lib/pkgconfig/$pkgname.pc
+  install -d "$pkgdir"/usr/share/doc/$pkgname
+  install -m644 doc/*.{gif,png,css,html} "$pkgdir"/usr/share/doc/$pkgname
+  install -Dm644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/COPYRIGHT
+
+  ln -s liblua5.1.so "$pkgdir"/usr/lib/liblua.so.5.1
+  ln -s liblua5.1.so "$pkgdir"/usr/lib/liblua.so.$pkgver
+
+  cd "$pkgdir"/usr/share/man/man1
+  mv lua.1 lua5.1.1
+  mv luac.1 luac5.1.1
+}

Copied: lua51/repos/staging-x86_64/lua-5.1-cflags.diff (from rev 279948, lua51/trunk/lua-5.1-cflags.diff)
===================================================================
--- staging-x86_64/lua-5.1-cflags.diff	                        (rev 0)
+++ staging-x86_64/lua-5.1-cflags.diff	2016-11-06 20:05:54 UTC (rev 279949)
@@ -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: lua51/repos/staging-x86_64/lua-arch.patch (from rev 279948, lua51/trunk/lua-arch.patch)
===================================================================
--- staging-x86_64/lua-arch.patch	                        (rev 0)
+++ staging-x86_64/lua-arch.patch	2016-11-06 20:05:54 UTC (rev 279949)
@@ -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



More information about the arch-commits mailing list