[arch-commits] Commit in lua/repos/staging-x86_64 (8 files)

Anatol Pomozov anatolik at archlinux.org
Wed Jul 8 03:49:20 UTC 2020


    Date: Wednesday, July 8, 2020 @ 03:49:19
  Author: anatolik
Revision: 391006

archrelease: copy trunk to staging-x86_64

Added:
  lua/repos/staging-x86_64/LICENSE
    (from rev 391005, lua/trunk/LICENSE)
  lua/repos/staging-x86_64/PKGBUILD
    (from rev 391005, lua/trunk/PKGBUILD)
  lua/repos/staging-x86_64/liblua.so.patch
    (from rev 391005, lua/trunk/liblua.so.patch)
  lua/repos/staging-x86_64/lua.pc
    (from rev 391005, lua/trunk/lua.pc)
Deleted:
  lua/repos/staging-x86_64/LICENSE
  lua/repos/staging-x86_64/PKGBUILD
  lua/repos/staging-x86_64/liblua.so.patch
  lua/repos/staging-x86_64/lua.pc

-----------------+
 LICENSE         |   60 +++++++++++++--------------
 PKGBUILD        |  119 ++++++++++++++++++++++++++---------------------------
 liblua.so.patch |  120 +++++++++++++++++++++++++++---------------------------
 lua.pc          |   40 +++++++++---------
 4 files changed, 168 insertions(+), 171 deletions(-)

Deleted: LICENSE
===================================================================
--- LICENSE	2020-07-08 03:48:50 UTC (rev 391005)
+++ LICENSE	2020-07-08 03:49:19 UTC (rev 391006)
@@ -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–2015 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/staging-x86_64/LICENSE (from rev 391005, lua/trunk/LICENSE)
===================================================================
--- LICENSE	                        (rev 0)
+++ LICENSE	2020-07-08 03:49:19 UTC (rev 391006)
@@ -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–2015 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: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-08 03:48:50 UTC (rev 391005)
+++ PKGBUILD	2020-07-08 03:49:19 UTC (rev 391006)
@@ -1,61 +0,0 @@
-# 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.4.0
-_majorver=${pkgver%.*}
-pkgrel=1
-pkgdesc='Powerful lightweight programming language designed for extending applications'
-arch=('x86_64')
-url='https://www.lua.org/'
-depends=('readline')
-license=('MIT')
-options=('!emptydirs')
-source=(https://www.lua.org/ftp/lua-$pkgver.tar.gz
-        liblua.so.patch
-        lua.pc
-        LICENSE)
-sha1sums=('8cdbffa8a214a23d190d7c45f38c19518ae62e89'
-          'cdfa66057f43aaf4b5914496aa6a4556f3a6e7a0'
-          '1aee8d1a219639d0efc534e483ffa1ee236fb393'
-          '05f5f3b7bef0258bd617c505b8992de639af4551')
-
-prepare() {
-  cd lua-$pkgver
-  patch -p1 -i ../liblua.so.patch
-
-  sed "s/%VER%/$_majorver/g;s/%REL%/$pkgver/g" ../lua.pc > lua.pc
-
-  # Lua 5.3.4 has wrong release version in its Makefile. Fix it.
-  # sed "s/^R= \$V.4/R= \$V.5/" -i Makefile
-}
-
-build() {
-  cd lua-$pkgver
-
-  make MYCFLAGS="$CFLAGS -fPIC" MYLDFLAGS="$LDFLAGS" linux
-}
-
-package() {
-  cd lua-$pkgver
-
-  make \
-    TO_LIB="liblua.a liblua.so liblua.so.$_majorver liblua.so.$pkgver" \
-    INSTALL_DATA='cp -d' \
-    INSTALL_TOP="$pkgdir"/usr \
-    INSTALL_MAN="$pkgdir"/usr/share/man/man1 \
-    install
-  ln -sf /usr/bin/lua "$pkgdir"/usr/bin/lua$_majorver
-  ln -sf /usr/bin/luac "$pkgdir"/usr/bin/luac$_majorver
-  ln -sf /usr/lib/liblua.so.$pkgver "$pkgdir"/usr/lib/liblua$_majorver.so
-
-  install -Dm644 lua.pc "$pkgdir"/usr/lib/pkgconfig/lua54.pc
-  ln -sf lua54.pc "$pkgdir"/usr/lib/pkgconfig/lua.pc
-  ln -sf lua54.pc "$pkgdir"/usr/lib/pkgconfig/lua5.4.pc
-  ln -sf lua54.pc "$pkgdir"/usr/lib/pkgconfig/lua-5.4.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/staging-x86_64/PKGBUILD (from rev 391005, lua/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-07-08 03:49:19 UTC (rev 391006)
@@ -0,0 +1,58 @@
+# 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.4.0
+_majorver=${pkgver%.*}
+pkgrel=2
+pkgdesc='Powerful lightweight programming language designed for extending applications'
+arch=('x86_64')
+url='https://www.lua.org/'
+depends=('readline')
+license=('MIT')
+options=('!emptydirs')
+source=(https://www.lua.org/ftp/lua-$pkgver.tar.gz
+        liblua.so.patch
+        lua.pc
+        LICENSE)
+sha1sums=('8cdbffa8a214a23d190d7c45f38c19518ae62e89'
+          'cdfa66057f43aaf4b5914496aa6a4556f3a6e7a0'
+          '1aee8d1a219639d0efc534e483ffa1ee236fb393'
+          '05f5f3b7bef0258bd617c505b8992de639af4551')
+
+prepare() {
+  cd lua-$pkgver
+  patch -p1 -i ../liblua.so.patch
+
+  sed "s/%VER%/$_majorver/g;s/%REL%/$pkgver/g" ../lua.pc > lua.pc
+}
+
+build() {
+  cd lua-$pkgver
+
+  make MYCFLAGS="$CFLAGS -fPIC" MYLDFLAGS="$LDFLAGS" linux-readline
+}
+
+package() {
+  cd lua-$pkgver
+
+  make \
+    TO_LIB="liblua.a liblua.so liblua.so.$_majorver liblua.so.$pkgver" \
+    INSTALL_DATA='cp -d' \
+    INSTALL_TOP="$pkgdir"/usr \
+    INSTALL_MAN="$pkgdir"/usr/share/man/man1 \
+    install
+  ln -sf /usr/bin/lua "$pkgdir"/usr/bin/lua$_majorver
+  ln -sf /usr/bin/luac "$pkgdir"/usr/bin/luac$_majorver
+  ln -sf /usr/lib/liblua.so.$pkgver "$pkgdir"/usr/lib/liblua$_majorver.so
+
+  install -Dm644 lua.pc "$pkgdir"/usr/lib/pkgconfig/lua54.pc
+  ln -sf lua54.pc "$pkgdir"/usr/lib/pkgconfig/lua.pc
+  ln -sf lua54.pc "$pkgdir"/usr/lib/pkgconfig/lua5.4.pc
+  ln -sf lua54.pc "$pkgdir"/usr/lib/pkgconfig/lua-5.4.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: liblua.so.patch
===================================================================
--- liblua.so.patch	2020-07-08 03:48:50 UTC (rev 391005)
+++ liblua.so.patch	2020-07-08 03:49:19 UTC (rev 391006)
@@ -1,60 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 416f444..eeaff03 100644
---- a/Makefile
-+++ b/Makefile
-@@ -52,7 +52,7 @@ R= $V.0
- all:	$(PLAT)
- 
- $(PLATS) help test clean:
--	@cd src && $(MAKE) $@
-+	@cd src && $(MAKE) $@ V=$(V) R=$(R)
- 
- install: dummy
- 	cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
-diff --git a/src/Makefile b/src/Makefile
-index 514593d..372a6dc 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -33,6 +33,7 @@ CMCFLAGS= -Os
- PLATS= guess aix bsd c89 freebsd generic linux linux-readline 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
- LIB_O=	lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o linit.o
- BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS)
-@@ -44,7 +45,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.
-@@ -60,6 +61,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 bdf927e..7e15198 100644
---- a/src/luaconf.h
-+++ b/src/luaconf.h
-@@ -227,7 +227,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 "/"
- 

Copied: lua/repos/staging-x86_64/liblua.so.patch (from rev 391005, lua/trunk/liblua.so.patch)
===================================================================
--- liblua.so.patch	                        (rev 0)
+++ liblua.so.patch	2020-07-08 03:49:19 UTC (rev 391006)
@@ -0,0 +1,60 @@
+diff --git a/Makefile b/Makefile
+index 416f444..eeaff03 100644
+--- a/Makefile
++++ b/Makefile
+@@ -52,7 +52,7 @@ R= $V.0
+ all:	$(PLAT)
+ 
+ $(PLATS) help test clean:
+-	@cd src && $(MAKE) $@
++	@cd src && $(MAKE) $@ V=$(V) R=$(R)
+ 
+ install: dummy
+ 	cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
+diff --git a/src/Makefile b/src/Makefile
+index 514593d..372a6dc 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -33,6 +33,7 @@ CMCFLAGS= -Os
+ PLATS= guess aix bsd c89 freebsd generic linux linux-readline 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
+ LIB_O=	lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o linit.o
+ BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS)
+@@ -44,7 +45,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.
+@@ -60,6 +61,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 bdf927e..7e15198 100644
+--- a/src/luaconf.h
++++ b/src/luaconf.h
+@@ -227,7 +227,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 "/"
+ 

Deleted: lua.pc
===================================================================
--- lua.pc	2020-07-08 03:48:50 UTC (rev 391005)
+++ lua.pc	2020-07-08 03:49:19 UTC (rev 391006)
@@ -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/staging-x86_64/lua.pc (from rev 391005, lua/trunk/lua.pc)
===================================================================
--- lua.pc	                        (rev 0)
+++ lua.pc	2020-07-08 03:49:19 UTC (rev 391006)
@@ -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