[arch-commits] Commit in xz/repos (6 files)
Pierre Schmitz
pierre at archlinux.org
Sun Nov 20 09:32:38 UTC 2016
Date: Sunday, November 20, 2016 @ 09:32:37
Author: pierre
Revision: 281650
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
xz/repos/testing-i686/
xz/repos/testing-i686/PKGBUILD
(from rev 281649, xz/trunk/PKGBUILD)
xz/repos/testing-i686/logical-op.patch
(from rev 281649, xz/trunk/logical-op.patch)
xz/repos/testing-x86_64/
xz/repos/testing-x86_64/PKGBUILD
(from rev 281649, xz/trunk/PKGBUILD)
xz/repos/testing-x86_64/logical-op.patch
(from rev 281649, xz/trunk/logical-op.patch)
---------------------------------+
testing-i686/PKGBUILD | 47 +++++++++++++++++++++++++++++++++++
testing-i686/logical-op.patch | 50 ++++++++++++++++++++++++++++++++++++++
testing-x86_64/PKGBUILD | 47 +++++++++++++++++++++++++++++++++++
testing-x86_64/logical-op.patch | 50 ++++++++++++++++++++++++++++++++++++++
4 files changed, 194 insertions(+)
Copied: xz/repos/testing-i686/PKGBUILD (from rev 281649, xz/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2016-11-20 09:32:37 UTC (rev 281650)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Pierre Schmitz <pierre at archlinux.de>
+# Contributor: François Charette <firmicus at gmx.net>
+
+pkgname=xz
+pkgver=5.2.2
+pkgrel=2
+pkgdesc='Library and command line tools for XZ and LZMA compressed files'
+arch=('i686' 'x86_64')
+url='http://tukaani.org/xz/'
+license=('GPL' 'LGPL' 'custom')
+depends=('sh')
+source=("http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+ "http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz.sig"
+ 'logical-op.patch')
+md5sums=('7cf6a8544a7dae8e8106fdf7addfa28c'
+ 'SKIP'
+ '51942446b4d3264e8de2f9676ee94075')
+validpgpkeys=('3690C240CE51B4670D30AD1C38EE757D69184620')
+
+prepare() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ patch -p1 -i ${srcdir}/logical-op.patch
+}
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ ./configure --prefix=/usr \
+ --disable-rpath \
+ --enable-werror
+ make
+}
+
+check() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make check
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+ install -d -m755 ${pkgdir}/usr/share/licenses/xz/
+ ln -sf /usr/share/doc/xz/COPYING ${pkgdir}/usr/share/licenses/xz/
+ ln -sf /usr/share/licenses/common/GPL2/license.txt ${pkgdir}/usr/share/doc/xz/COPYING.GPLv2
+}
Copied: xz/repos/testing-i686/logical-op.patch (from rev 281649, xz/trunk/logical-op.patch)
===================================================================
--- testing-i686/logical-op.patch (rev 0)
+++ testing-i686/logical-op.patch 2016-11-20 09:32:37 UTC (rev 281650)
@@ -0,0 +1,50 @@
+From 1b0ac0c53c761263e91e34195cb21dfdcfeac0bd Mon Sep 17 00:00:00 2001
+From: Lasse Collin <lasse.collin at tukaani.org>
+Date: Thu, 16 Jun 2016 22:46:02 +0300
+Subject: [PATCH 1/1] xz: Silence warnings from -Wlogical-op.
+
+Thanks to Evan Nemerson.
+---
+ src/xz/file_io.c | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/src/xz/file_io.c b/src/xz/file_io.c
+index 69cf632..2ca188b 100644
+--- a/src/xz/file_io.c
++++ b/src/xz/file_io.c
+@@ -45,6 +45,14 @@ static bool warn_fchown;
+ # define O_NOCTTY 0
+ #endif
+
++// Using this macro to silence a warning from gcc -Wlogical-op.
++#if EAGAIN == EWOULDBLOCK
++# define IS_EAGAIN_OR_EWOULDBLOCK(e) ((e) == EAGAIN)
++#else
++# define IS_EAGAIN_OR_EWOULDBLOCK(e) \
++ ((e) == EAGAIN || (e) == EWOULDBLOCK)
++#endif
++
+
+ typedef enum {
+ IO_WAIT_MORE, // Reading or writing is possible.
+@@ -1102,7 +1110,7 @@ io_read(file_pair *pair, io_buf *buf_union, size_t size)
+ }
+
+ #ifndef TUKLIB_DOSLIKE
+- if (errno == EAGAIN || errno == EWOULDBLOCK) {
++ if (IS_EAGAIN_OR_EWOULDBLOCK(errno)) {
+ const io_wait_ret ret = io_wait(pair,
+ mytime_get_flush_timeout(),
+ true);
+@@ -1190,7 +1198,7 @@ io_write_buf(file_pair *pair, const uint8_t *buf, size_t size)
+ }
+
+ #ifndef TUKLIB_DOSLIKE
+- if (errno == EAGAIN || errno == EWOULDBLOCK) {
++ if (IS_EAGAIN_OR_EWOULDBLOCK(errno)) {
+ if (io_wait(pair, -1, false) == IO_WAIT_MORE)
+ continue;
+
+--
+1.8.5.5
+
Copied: xz/repos/testing-x86_64/PKGBUILD (from rev 281649, xz/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2016-11-20 09:32:37 UTC (rev 281650)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Pierre Schmitz <pierre at archlinux.de>
+# Contributor: François Charette <firmicus at gmx.net>
+
+pkgname=xz
+pkgver=5.2.2
+pkgrel=2
+pkgdesc='Library and command line tools for XZ and LZMA compressed files'
+arch=('i686' 'x86_64')
+url='http://tukaani.org/xz/'
+license=('GPL' 'LGPL' 'custom')
+depends=('sh')
+source=("http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+ "http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz.sig"
+ 'logical-op.patch')
+md5sums=('7cf6a8544a7dae8e8106fdf7addfa28c'
+ 'SKIP'
+ '51942446b4d3264e8de2f9676ee94075')
+validpgpkeys=('3690C240CE51B4670D30AD1C38EE757D69184620')
+
+prepare() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ patch -p1 -i ${srcdir}/logical-op.patch
+}
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ ./configure --prefix=/usr \
+ --disable-rpath \
+ --enable-werror
+ make
+}
+
+check() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make check
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+ install -d -m755 ${pkgdir}/usr/share/licenses/xz/
+ ln -sf /usr/share/doc/xz/COPYING ${pkgdir}/usr/share/licenses/xz/
+ ln -sf /usr/share/licenses/common/GPL2/license.txt ${pkgdir}/usr/share/doc/xz/COPYING.GPLv2
+}
Copied: xz/repos/testing-x86_64/logical-op.patch (from rev 281649, xz/trunk/logical-op.patch)
===================================================================
--- testing-x86_64/logical-op.patch (rev 0)
+++ testing-x86_64/logical-op.patch 2016-11-20 09:32:37 UTC (rev 281650)
@@ -0,0 +1,50 @@
+From 1b0ac0c53c761263e91e34195cb21dfdcfeac0bd Mon Sep 17 00:00:00 2001
+From: Lasse Collin <lasse.collin at tukaani.org>
+Date: Thu, 16 Jun 2016 22:46:02 +0300
+Subject: [PATCH 1/1] xz: Silence warnings from -Wlogical-op.
+
+Thanks to Evan Nemerson.
+---
+ src/xz/file_io.c | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/src/xz/file_io.c b/src/xz/file_io.c
+index 69cf632..2ca188b 100644
+--- a/src/xz/file_io.c
++++ b/src/xz/file_io.c
+@@ -45,6 +45,14 @@ static bool warn_fchown;
+ # define O_NOCTTY 0
+ #endif
+
++// Using this macro to silence a warning from gcc -Wlogical-op.
++#if EAGAIN == EWOULDBLOCK
++# define IS_EAGAIN_OR_EWOULDBLOCK(e) ((e) == EAGAIN)
++#else
++# define IS_EAGAIN_OR_EWOULDBLOCK(e) \
++ ((e) == EAGAIN || (e) == EWOULDBLOCK)
++#endif
++
+
+ typedef enum {
+ IO_WAIT_MORE, // Reading or writing is possible.
+@@ -1102,7 +1110,7 @@ io_read(file_pair *pair, io_buf *buf_union, size_t size)
+ }
+
+ #ifndef TUKLIB_DOSLIKE
+- if (errno == EAGAIN || errno == EWOULDBLOCK) {
++ if (IS_EAGAIN_OR_EWOULDBLOCK(errno)) {
+ const io_wait_ret ret = io_wait(pair,
+ mytime_get_flush_timeout(),
+ true);
+@@ -1190,7 +1198,7 @@ io_write_buf(file_pair *pair, const uint8_t *buf, size_t size)
+ }
+
+ #ifndef TUKLIB_DOSLIKE
+- if (errno == EAGAIN || errno == EWOULDBLOCK) {
++ if (IS_EAGAIN_OR_EWOULDBLOCK(errno)) {
+ if (io_wait(pair, -1, false) == IO_WAIT_MORE)
+ continue;
+
+--
+1.8.5.5
+
More information about the arch-commits
mailing list