[arch-commits] Commit in lua/repos (16 files)
Anatol Pomozov
anatolik at archlinux.org
Tue May 12 16:17:58 UTC 2015
Date: Tuesday, May 12, 2015 @ 18:17:58
Author: anatolik
Revision: 239194
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
lua/repos/testing-i686/LICENSE
(from rev 239193, lua/trunk/LICENSE)
lua/repos/testing-i686/PKGBUILD
(from rev 239193, lua/trunk/PKGBUILD)
lua/repos/testing-i686/liblua.so.patch
(from rev 239193, lua/trunk/liblua.so.patch)
lua/repos/testing-i686/lua.pc
(from rev 239193, lua/trunk/lua.pc)
lua/repos/testing-x86_64/LICENSE
(from rev 239193, lua/trunk/LICENSE)
lua/repos/testing-x86_64/PKGBUILD
(from rev 239193, lua/trunk/PKGBUILD)
lua/repos/testing-x86_64/liblua.so.patch
(from rev 239193, lua/trunk/liblua.so.patch)
lua/repos/testing-x86_64/lua.pc
(from rev 239193, lua/trunk/lua.pc)
Deleted:
lua/repos/testing-i686/LICENSE
lua/repos/testing-i686/PKGBUILD
lua/repos/testing-i686/liblua.so.patch
lua/repos/testing-i686/lua.pc
lua/repos/testing-x86_64/LICENSE
lua/repos/testing-x86_64/PKGBUILD
lua/repos/testing-x86_64/liblua.so.patch
lua/repos/testing-x86_64/lua.pc
--------------------------------+
/LICENSE | 60 +++++++++++++++++++
/PKGBUILD | 104 +++++++++++++++++++++++++++++++++
/liblua.so.patch | 120 +++++++++++++++++++++++++++++++++++++++
/lua.pc | 40 +++++++++++++
testing-i686/LICENSE | 30 ---------
testing-i686/PKGBUILD | 51 ----------------
testing-i686/liblua.so.patch | 60 -------------------
testing-i686/lua.pc | 20 ------
testing-x86_64/LICENSE | 30 ---------
testing-x86_64/PKGBUILD | 51 ----------------
testing-x86_64/liblua.so.patch | 60 -------------------
testing-x86_64/lua.pc | 20 ------
12 files changed, 324 insertions(+), 322 deletions(-)
Deleted: testing-i686/LICENSE
===================================================================
--- testing-i686/LICENSE 2015-05-12 16:17:05 UTC (rev 239193)
+++ testing-i686/LICENSE 2015-05-12 16:17:58 UTC (rev 239194)
@@ -1,30 +0,0 @@
-License
-
-Lua is free software distributed under the terms of the MIT license
-reproduced below; it may be used for any purpose, including commercial
-purposes, at absolutely no cost without having to ask us. The only
-requirement is that if you do use Lua, then you should give us credit
-by including the appropriate copyright notice somewhere in your
-product or its documentation.
-
- Copyright © 1994–2012 Lua.org, PUC-Rio.
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use, copy,
- modify, merge, publish, distribute, sublicense, and/or sell copies
- of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
Copied: lua/repos/testing-i686/LICENSE (from rev 239193, lua/trunk/LICENSE)
===================================================================
--- testing-i686/LICENSE (rev 0)
+++ testing-i686/LICENSE 2015-05-12 16:17:58 UTC (rev 239194)
@@ -0,0 +1,30 @@
+License
+
+Lua is free software distributed under the terms of the MIT license
+reproduced below; it may be used for any purpose, including commercial
+purposes, at absolutely no cost without having to ask us. The only
+requirement is that if you do use Lua, then you should give us credit
+by including the appropriate copyright notice somewhere in your
+product or its documentation.
+
+ Copyright © 1994–2012 Lua.org, PUC-Rio.
+
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation
+ files (the "Software"), to deal in the Software without
+ restriction, including without limitation the rights to use, copy,
+ modify, merge, publish, distribute, sublicense, and/or sell copies
+ of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2015-05-12 16:17:05 UTC (rev 239193)
+++ testing-i686/PKGBUILD 2015-05-12 16:17:58 UTC (rev 239194)
@@ -1,51 +0,0 @@
-# $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.3.0
-pkgrel=1
-pkgdesc='Powerful lightweight programming language designed for extending applications'
-arch=('i686' 'x86_64')
-url='http://www.lua.org/'
-depends=('readline')
-license=('MIT')
-options=('!emptydirs')
-source=(http://www.lua.org/ftp/lua-$pkgver.tar.gz
- liblua.so.patch
- lua.pc
- LICENSE)
-md5sums=('a1b0a7e92d0c85bbff7a8d27bf29f8af'
- '85fe4e5f780376457eba3bc23d2cb2d3'
- 'e7ba6c2b695b0b84a5ea0cbff5fc9067'
- '0e2bd67b909b9ff673da844ca3480df2')
-
-prepare() {
- cd lua-$pkgver
- patch -p1 -i ../liblua.so.patch
-
- sed "s/%VER%/${pkgver%.*}/g;s/%REL%/$pkgver/g" ../lua.pc > lua.pc
-}
-
-build() {
- cd lua-$pkgver
-
- make MYCFLAGS="$CFLAGS -fPIC" MYLDFLAGS="$LDFLAGS" linux
-}
-
-package() {
- cd lua-$pkgver
-
- make \
- TO_LIB="liblua.a liblua.so liblua.so.5.3 liblua.so.$pkgver" \
- INSTALL_DATA='cp -d' \
- INSTALL_TOP="$pkgdir"/usr \
- INSTALL_MAN="$pkgdir"/usr/share/man/man1 \
- install
- install -Dm644 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 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
Copied: lua/repos/testing-i686/PKGBUILD (from rev 239193, lua/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2015-05-12 16:17:58 UTC (rev 239194)
@@ -0,0 +1,52 @@
+# $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.3.0
+pkgrel=2
+pkgdesc='Powerful lightweight programming language designed for extending applications'
+arch=('i686' 'x86_64')
+url='http://www.lua.org/'
+depends=('readline')
+license=('MIT')
+options=('!emptydirs')
+source=(http://www.lua.org/ftp/lua-$pkgver.tar.gz
+ liblua.so.patch
+ lua.pc
+ LICENSE)
+md5sums=('a1b0a7e92d0c85bbff7a8d27bf29f8af'
+ '85fe4e5f780376457eba3bc23d2cb2d3'
+ 'e7ba6c2b695b0b84a5ea0cbff5fc9067'
+ '0e2bd67b909b9ff673da844ca3480df2')
+
+prepare() {
+ cd lua-$pkgver
+ patch -p1 -i ../liblua.so.patch
+
+ sed "s/%VER%/${pkgver%.*}/g;s/%REL%/$pkgver/g" ../lua.pc > lua.pc
+}
+
+build() {
+ cd lua-$pkgver
+
+ # quite a lot of packages still use lua 5.1 API, enable 5.1 compat mode
+ make MYCFLAGS="$CFLAGS -fPIC -DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1" MYLDFLAGS="$LDFLAGS" linux
+}
+
+package() {
+ cd lua-$pkgver
+
+ make \
+ TO_LIB="liblua.a liblua.so liblua.so.5.3 liblua.so.$pkgver" \
+ INSTALL_DATA='cp -d' \
+ INSTALL_TOP="$pkgdir"/usr \
+ INSTALL_MAN="$pkgdir"/usr/share/man/man1 \
+ install
+ install -Dm644 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 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
Deleted: testing-i686/liblua.so.patch
===================================================================
--- testing-i686/liblua.so.patch 2015-05-12 16:17:05 UTC (rev 239193)
+++ testing-i686/liblua.so.patch 2015-05-12 16:17:58 UTC (rev 239194)
@@ -1,60 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 7fa91c8..dccf485 100644
---- a/Makefile
-+++ b/Makefile
-@@ -52,7 +52,7 @@ R= $V.0
- all: $(PLAT)
-
- $(PLATS) clean:
-- cd src && $(MAKE) $@
-+ cd src && $(MAKE) $@ V=$(V) R=$(R)
-
- test: dummy
- src/lua -v
-diff --git a/src/Makefile b/src/Makefile
-index 2e7a412..fa5769f 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -29,6 +29,7 @@ MYOBJS=
- PLATS= aix bsd c89 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_T= luac
- 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 @@ $(LUA_A): $(BASE_O)
- $(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)
-
-diff --git a/src/luaconf.h b/src/luaconf.h
-index fd28d21..e2662cc 100644
---- a/src/luaconf.h
-+++ b/src/luaconf.h
-@@ -175,7 +175,7 @@
-
- #else /* }{ */
-
--#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 \
Copied: lua/repos/testing-i686/liblua.so.patch (from rev 239193, lua/trunk/liblua.so.patch)
===================================================================
--- testing-i686/liblua.so.patch (rev 0)
+++ testing-i686/liblua.so.patch 2015-05-12 16:17:58 UTC (rev 239194)
@@ -0,0 +1,60 @@
+diff --git a/Makefile b/Makefile
+index 7fa91c8..dccf485 100644
+--- a/Makefile
++++ b/Makefile
+@@ -52,7 +52,7 @@ R= $V.0
+ all: $(PLAT)
+
+ $(PLATS) clean:
+- cd src && $(MAKE) $@
++ cd src && $(MAKE) $@ V=$(V) R=$(R)
+
+ test: dummy
+ src/lua -v
+diff --git a/src/Makefile b/src/Makefile
+index 2e7a412..fa5769f 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -29,6 +29,7 @@ MYOBJS=
+ PLATS= aix bsd c89 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_T= luac
+ 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 @@ $(LUA_A): $(BASE_O)
+ $(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)
+
+diff --git a/src/luaconf.h b/src/luaconf.h
+index fd28d21..e2662cc 100644
+--- a/src/luaconf.h
++++ b/src/luaconf.h
+@@ -175,7 +175,7 @@
+
+ #else /* }{ */
+
+-#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 \
Deleted: testing-i686/lua.pc
===================================================================
--- testing-i686/lua.pc 2015-05-12 16:17:05 UTC (rev 239193)
+++ testing-i686/lua.pc 2015-05-12 16:17:58 UTC (rev 239194)
@@ -1,20 +0,0 @@
-V=%VER%
-R=%REL%
-
-prefix=/usr
-INSTALL_BIN=${prefix}/bin
-INSTALL_INC=${prefix}/include
-INSTALL_LIB=${prefix}/lib
-INSTALL_MAN=${prefix}/man/man1
-INSTALL_LMOD=${prefix}/share/lua/${V}
-INSTALL_CMOD=${prefix}/lib/lua/${V}
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: Lua
-Description: An Extensible Extension Language
-Version: ${R}
-Requires:
-Libs: -L${libdir} -llua -lm
-Cflags: -I${includedir}
Copied: lua/repos/testing-i686/lua.pc (from rev 239193, lua/trunk/lua.pc)
===================================================================
--- testing-i686/lua.pc (rev 0)
+++ testing-i686/lua.pc 2015-05-12 16:17:58 UTC (rev 239194)
@@ -0,0 +1,20 @@
+V=%VER%
+R=%REL%
+
+prefix=/usr
+INSTALL_BIN=${prefix}/bin
+INSTALL_INC=${prefix}/include
+INSTALL_LIB=${prefix}/lib
+INSTALL_MAN=${prefix}/man/man1
+INSTALL_LMOD=${prefix}/share/lua/${V}
+INSTALL_CMOD=${prefix}/lib/lua/${V}
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: Lua
+Description: An Extensible Extension Language
+Version: ${R}
+Requires:
+Libs: -L${libdir} -llua -lm
+Cflags: -I${includedir}
Deleted: testing-x86_64/LICENSE
===================================================================
--- testing-x86_64/LICENSE 2015-05-12 16:17:05 UTC (rev 239193)
+++ testing-x86_64/LICENSE 2015-05-12 16:17:58 UTC (rev 239194)
@@ -1,30 +0,0 @@
-License
-
-Lua is free software distributed under the terms of the MIT license
-reproduced below; it may be used for any purpose, including commercial
-purposes, at absolutely no cost without having to ask us. The only
-requirement is that if you do use Lua, then you should give us credit
-by including the appropriate copyright notice somewhere in your
-product or its documentation.
-
- Copyright © 1994–2012 Lua.org, PUC-Rio.
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use, copy,
- modify, merge, publish, distribute, sublicense, and/or sell copies
- of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
Copied: lua/repos/testing-x86_64/LICENSE (from rev 239193, lua/trunk/LICENSE)
===================================================================
--- testing-x86_64/LICENSE (rev 0)
+++ testing-x86_64/LICENSE 2015-05-12 16:17:58 UTC (rev 239194)
@@ -0,0 +1,30 @@
+License
+
+Lua is free software distributed under the terms of the MIT license
+reproduced below; it may be used for any purpose, including commercial
+purposes, at absolutely no cost without having to ask us. The only
+requirement is that if you do use Lua, then you should give us credit
+by including the appropriate copyright notice somewhere in your
+product or its documentation.
+
+ Copyright © 1994–2012 Lua.org, PUC-Rio.
+
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation
+ files (the "Software"), to deal in the Software without
+ restriction, including without limitation the rights to use, copy,
+ modify, merge, publish, distribute, sublicense, and/or sell copies
+ of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2015-05-12 16:17:05 UTC (rev 239193)
+++ testing-x86_64/PKGBUILD 2015-05-12 16:17:58 UTC (rev 239194)
@@ -1,51 +0,0 @@
-# $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.3.0
-pkgrel=1
-pkgdesc='Powerful lightweight programming language designed for extending applications'
-arch=('i686' 'x86_64')
-url='http://www.lua.org/'
-depends=('readline')
-license=('MIT')
-options=('!emptydirs')
-source=(http://www.lua.org/ftp/lua-$pkgver.tar.gz
- liblua.so.patch
- lua.pc
- LICENSE)
-md5sums=('a1b0a7e92d0c85bbff7a8d27bf29f8af'
- '85fe4e5f780376457eba3bc23d2cb2d3'
- 'e7ba6c2b695b0b84a5ea0cbff5fc9067'
- '0e2bd67b909b9ff673da844ca3480df2')
-
-prepare() {
- cd lua-$pkgver
- patch -p1 -i ../liblua.so.patch
-
- sed "s/%VER%/${pkgver%.*}/g;s/%REL%/$pkgver/g" ../lua.pc > lua.pc
-}
-
-build() {
- cd lua-$pkgver
-
- make MYCFLAGS="$CFLAGS -fPIC" MYLDFLAGS="$LDFLAGS" linux
-}
-
-package() {
- cd lua-$pkgver
-
- make \
- TO_LIB="liblua.a liblua.so liblua.so.5.3 liblua.so.$pkgver" \
- INSTALL_DATA='cp -d' \
- INSTALL_TOP="$pkgdir"/usr \
- INSTALL_MAN="$pkgdir"/usr/share/man/man1 \
- install
- install -Dm644 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 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
Copied: lua/repos/testing-x86_64/PKGBUILD (from rev 239193, lua/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2015-05-12 16:17:58 UTC (rev 239194)
@@ -0,0 +1,52 @@
+# $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.3.0
+pkgrel=2
+pkgdesc='Powerful lightweight programming language designed for extending applications'
+arch=('i686' 'x86_64')
+url='http://www.lua.org/'
+depends=('readline')
+license=('MIT')
+options=('!emptydirs')
+source=(http://www.lua.org/ftp/lua-$pkgver.tar.gz
+ liblua.so.patch
+ lua.pc
+ LICENSE)
+md5sums=('a1b0a7e92d0c85bbff7a8d27bf29f8af'
+ '85fe4e5f780376457eba3bc23d2cb2d3'
+ 'e7ba6c2b695b0b84a5ea0cbff5fc9067'
+ '0e2bd67b909b9ff673da844ca3480df2')
+
+prepare() {
+ cd lua-$pkgver
+ patch -p1 -i ../liblua.so.patch
+
+ sed "s/%VER%/${pkgver%.*}/g;s/%REL%/$pkgver/g" ../lua.pc > lua.pc
+}
+
+build() {
+ cd lua-$pkgver
+
+ # quite a lot of packages still use lua 5.1 API, enable 5.1 compat mode
+ make MYCFLAGS="$CFLAGS -fPIC -DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1" MYLDFLAGS="$LDFLAGS" linux
+}
+
+package() {
+ cd lua-$pkgver
+
+ make \
+ TO_LIB="liblua.a liblua.so liblua.so.5.3 liblua.so.$pkgver" \
+ INSTALL_DATA='cp -d' \
+ INSTALL_TOP="$pkgdir"/usr \
+ INSTALL_MAN="$pkgdir"/usr/share/man/man1 \
+ install
+ install -Dm644 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 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
Deleted: testing-x86_64/liblua.so.patch
===================================================================
--- testing-x86_64/liblua.so.patch 2015-05-12 16:17:05 UTC (rev 239193)
+++ testing-x86_64/liblua.so.patch 2015-05-12 16:17:58 UTC (rev 239194)
@@ -1,60 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 7fa91c8..dccf485 100644
---- a/Makefile
-+++ b/Makefile
-@@ -52,7 +52,7 @@ R= $V.0
- all: $(PLAT)
-
- $(PLATS) clean:
-- cd src && $(MAKE) $@
-+ cd src && $(MAKE) $@ V=$(V) R=$(R)
-
- test: dummy
- src/lua -v
-diff --git a/src/Makefile b/src/Makefile
-index 2e7a412..fa5769f 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -29,6 +29,7 @@ MYOBJS=
- PLATS= aix bsd c89 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_T= luac
- 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 @@ $(LUA_A): $(BASE_O)
- $(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)
-
-diff --git a/src/luaconf.h b/src/luaconf.h
-index fd28d21..e2662cc 100644
---- a/src/luaconf.h
-+++ b/src/luaconf.h
-@@ -175,7 +175,7 @@
-
- #else /* }{ */
-
--#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 \
Copied: lua/repos/testing-x86_64/liblua.so.patch (from rev 239193, lua/trunk/liblua.so.patch)
===================================================================
--- testing-x86_64/liblua.so.patch (rev 0)
+++ testing-x86_64/liblua.so.patch 2015-05-12 16:17:58 UTC (rev 239194)
@@ -0,0 +1,60 @@
+diff --git a/Makefile b/Makefile
+index 7fa91c8..dccf485 100644
+--- a/Makefile
++++ b/Makefile
+@@ -52,7 +52,7 @@ R= $V.0
+ all: $(PLAT)
+
+ $(PLATS) clean:
+- cd src && $(MAKE) $@
++ cd src && $(MAKE) $@ V=$(V) R=$(R)
+
+ test: dummy
+ src/lua -v
+diff --git a/src/Makefile b/src/Makefile
+index 2e7a412..fa5769f 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -29,6 +29,7 @@ MYOBJS=
+ PLATS= aix bsd c89 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_T= luac
+ 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 @@ $(LUA_A): $(BASE_O)
+ $(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)
+
+diff --git a/src/luaconf.h b/src/luaconf.h
+index fd28d21..e2662cc 100644
+--- a/src/luaconf.h
++++ b/src/luaconf.h
+@@ -175,7 +175,7 @@
+
+ #else /* }{ */
+
+-#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 \
Deleted: testing-x86_64/lua.pc
===================================================================
--- testing-x86_64/lua.pc 2015-05-12 16:17:05 UTC (rev 239193)
+++ testing-x86_64/lua.pc 2015-05-12 16:17:58 UTC (rev 239194)
@@ -1,20 +0,0 @@
-V=%VER%
-R=%REL%
-
-prefix=/usr
-INSTALL_BIN=${prefix}/bin
-INSTALL_INC=${prefix}/include
-INSTALL_LIB=${prefix}/lib
-INSTALL_MAN=${prefix}/man/man1
-INSTALL_LMOD=${prefix}/share/lua/${V}
-INSTALL_CMOD=${prefix}/lib/lua/${V}
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: Lua
-Description: An Extensible Extension Language
-Version: ${R}
-Requires:
-Libs: -L${libdir} -llua -lm
-Cflags: -I${includedir}
Copied: lua/repos/testing-x86_64/lua.pc (from rev 239193, lua/trunk/lua.pc)
===================================================================
--- testing-x86_64/lua.pc (rev 0)
+++ testing-x86_64/lua.pc 2015-05-12 16:17:58 UTC (rev 239194)
@@ -0,0 +1,20 @@
+V=%VER%
+R=%REL%
+
+prefix=/usr
+INSTALL_BIN=${prefix}/bin
+INSTALL_INC=${prefix}/include
+INSTALL_LIB=${prefix}/lib
+INSTALL_MAN=${prefix}/man/man1
+INSTALL_LMOD=${prefix}/share/lua/${V}
+INSTALL_CMOD=${prefix}/lib/lua/${V}
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: Lua
+Description: An Extensible Extension Language
+Version: ${R}
+Requires:
+Libs: -L${libdir} -llua -lm
+Cflags: -I${includedir}
More information about the arch-commits
mailing list