[arch-commits] Commit in diffoscope/repos/community-x86_64 (4 files)

Santiago Torres-Arias sangy at archlinux.org
Sat May 16 01:21:22 UTC 2020


    Date: Saturday, May 16, 2020 @ 01:21:21
  Author: sangy
Revision: 628145

archrelease: copy trunk to community-x86_64

Added:
  diffoscope/repos/community-x86_64/0001-Update-llvm-diff-for-llvm-10.patch
    (from rev 628144, diffoscope/trunk/0001-Update-llvm-diff-for-llvm-10.patch)
  diffoscope/repos/community-x86_64/PKGBUILD
    (from rev 628144, diffoscope/trunk/PKGBUILD)
Deleted:
  diffoscope/repos/community-x86_64/0001-Update-llvm-diff-for-llvm-10.patch
  diffoscope/repos/community-x86_64/PKGBUILD

-----------------------------------------+
 0001-Update-llvm-diff-for-llvm-10.patch |  142 ++++++++++----------
 PKGBUILD                                |  204 +++++++++++++++---------------
 2 files changed, 173 insertions(+), 173 deletions(-)

Deleted: 0001-Update-llvm-diff-for-llvm-10.patch
===================================================================
--- 0001-Update-llvm-diff-for-llvm-10.patch	2020-05-16 01:20:57 UTC (rev 628144)
+++ 0001-Update-llvm-diff-for-llvm-10.patch	2020-05-16 01:21:21 UTC (rev 628145)
@@ -1,71 +0,0 @@
-From c645b977740b8c42a4b1ee8fe3f6856cac7cee1e Mon Sep 17 00:00:00 2001
-From: Jelle van der Waa <jelle at archlinux.org>
-Date: Mon, 27 Apr 2020 21:48:51 +0200
-Subject: [PATCH] Update llvm diff for llvm 10.
-
-Signed-off-by: Jelle van der Waa <jelle at archlinux.org>
----
- tests/comparators/test_rlib.py            |  3 ++
- tests/data/rlib_llvm_dis_expected_diff_10 | 36 +++++++++++++++++++++++
- 2 files changed, 39 insertions(+)
- create mode 100644 tests/data/rlib_llvm_dis_expected_diff_10
-
-diff --git a/tests/comparators/test_rlib.py b/tests/comparators/test_rlib.py
-index e47a0f4b..180d6b66 100644
---- a/tests/comparators/test_rlib.py
-+++ b/tests/comparators/test_rlib.py
-@@ -74,6 +74,9 @@ def rlib_dis_expected_diff():
-     if LooseVersion(str(actual_ver)) >= LooseVersion("7.0"):
-         diff_file = 'rlib_llvm_dis_expected_diff_7'
- 
-+    if LooseVersion(str(actual_ver)) >= LooseVersion("10.0"):
-+        diff_file = 'rlib_llvm_dis_expected_diff_10'
-+
-     return get_data(diff_file)
- 
- 
-diff --git a/tests/data/rlib_llvm_dis_expected_diff_10 b/tests/data/rlib_llvm_dis_expected_diff_10
-new file mode 100644
-index 00000000..46316a2f
---- /dev/null
-+++ b/tests/data/rlib_llvm_dis_expected_diff_10
-@@ -0,0 +1,36 @@
-+@@ -42,32 +42,32 @@
-+ entry-block:
-+   %out.i.i = alloca i8*, align 8
-+   %4 = icmp ult i64 %3, 17
-+   br i1 %4, label %then-block-195-.i, label %_ZN12alloc_system3imp8allocate17h8ba7625cc4a820e8E.exit.i
-+ 
-+ then-block-195-.i:                                ; preds = %entry-block
-+   %5 = tail call i8* @realloc(i8* %0, i64 %2) #2
-+-  br label %_ZN12alloc_system3imp10reallocate17h4a0811c9ec086854E.exit
-++  br label %_ZN12alloc_system3imp10reallocate1l44a0811c9ec086854E.exit
-+ 
-+ _ZN12alloc_system3imp8allocate17h8ba7625cc4a820e8E.exit.i: ; preds = %entry-block
-+   %6 = bitcast i8** %out.i.i to i8*
-+   call void @llvm.lifetime.start.p0i8(i64 8, i8* %6) #2
-+   store i8* null, i8** %out.i.i, align 8
-+   %7 = call i32 @posix_memalign(i8** nonnull %out.i.i, i64 %3, i64 %2) #2
-+   %8 = icmp eq i32 %7, 0
-+   %9 = load i8*, i8** %out.i.i, align 8
-+   %sret_slot.0.i.i = select i1 %8, i8* %9, i8* null
-+   call void @llvm.lifetime.end.p0i8(i64 8, i8* %6) #2
-+   %10 = icmp ule i64 %2, %1
-+   %11 = select i1 %10, i64 %2, i64 %1
-+   call void @llvm.memmove.p0i8.p0i8.i64(i8* align 1 %sret_slot.0.i.i, i8* align 1 %0, i64 %11, i1 false)
-+   call void @free(i8* %0) #2
-+-  br label %_ZN12alloc_system3imp10reallocate17h4a0811c9ec086854E.exit
-++  br label %_ZN12alloc_system3imp10reallocate1l44a0811c9ec086854E.exit
-+ 
-+-_ZN12alloc_system3imp10reallocate17h4a0811c9ec086854E.exit: ; preds = %_ZN12alloc_system3imp8allocate17h8ba7625cc4a820e8E.exit.i, %then-block-195-.i
-++_ZN12alloc_system3imp10reallocate1l44a0811c9ec086854E.exit: ; preds = %_ZN12alloc_system3imp8allocate17h8ba7625cc4a820e8E.exit.i, %then-block-195-.i
-+   %sret_slot.0.i = phi i8* [ %5, %then-block-195-.i ], [ %sret_slot.0.i.i, %_ZN12alloc_system3imp8allocate17h8ba7625cc4a820e8E.exit.i ]
-+   ret i8* %sret_slot.0.i
-+ }
-+ 
-+ ; Function Attrs: nounwind readnone uwtable
-+ define i64 @__rust_reallocate_inplace(i8* nocapture readnone %0, i64 %1, i64 %2, i64 %3) unnamed_addr #1 {
-+ entry-block:
--- 
-2.26.2
-

Copied: diffoscope/repos/community-x86_64/0001-Update-llvm-diff-for-llvm-10.patch (from rev 628144, diffoscope/trunk/0001-Update-llvm-diff-for-llvm-10.patch)
===================================================================
--- 0001-Update-llvm-diff-for-llvm-10.patch	                        (rev 0)
+++ 0001-Update-llvm-diff-for-llvm-10.patch	2020-05-16 01:21:21 UTC (rev 628145)
@@ -0,0 +1,71 @@
+From c645b977740b8c42a4b1ee8fe3f6856cac7cee1e Mon Sep 17 00:00:00 2001
+From: Jelle van der Waa <jelle at archlinux.org>
+Date: Mon, 27 Apr 2020 21:48:51 +0200
+Subject: [PATCH] Update llvm diff for llvm 10.
+
+Signed-off-by: Jelle van der Waa <jelle at archlinux.org>
+---
+ tests/comparators/test_rlib.py            |  3 ++
+ tests/data/rlib_llvm_dis_expected_diff_10 | 36 +++++++++++++++++++++++
+ 2 files changed, 39 insertions(+)
+ create mode 100644 tests/data/rlib_llvm_dis_expected_diff_10
+
+diff --git a/tests/comparators/test_rlib.py b/tests/comparators/test_rlib.py
+index e47a0f4b..180d6b66 100644
+--- a/tests/comparators/test_rlib.py
++++ b/tests/comparators/test_rlib.py
+@@ -74,6 +74,9 @@ def rlib_dis_expected_diff():
+     if LooseVersion(str(actual_ver)) >= LooseVersion("7.0"):
+         diff_file = 'rlib_llvm_dis_expected_diff_7'
+ 
++    if LooseVersion(str(actual_ver)) >= LooseVersion("10.0"):
++        diff_file = 'rlib_llvm_dis_expected_diff_10'
++
+     return get_data(diff_file)
+ 
+ 
+diff --git a/tests/data/rlib_llvm_dis_expected_diff_10 b/tests/data/rlib_llvm_dis_expected_diff_10
+new file mode 100644
+index 00000000..46316a2f
+--- /dev/null
++++ b/tests/data/rlib_llvm_dis_expected_diff_10
+@@ -0,0 +1,36 @@
++@@ -42,32 +42,32 @@
++ entry-block:
++   %out.i.i = alloca i8*, align 8
++   %4 = icmp ult i64 %3, 17
++   br i1 %4, label %then-block-195-.i, label %_ZN12alloc_system3imp8allocate17h8ba7625cc4a820e8E.exit.i
++ 
++ then-block-195-.i:                                ; preds = %entry-block
++   %5 = tail call i8* @realloc(i8* %0, i64 %2) #2
++-  br label %_ZN12alloc_system3imp10reallocate17h4a0811c9ec086854E.exit
+++  br label %_ZN12alloc_system3imp10reallocate1l44a0811c9ec086854E.exit
++ 
++ _ZN12alloc_system3imp8allocate17h8ba7625cc4a820e8E.exit.i: ; preds = %entry-block
++   %6 = bitcast i8** %out.i.i to i8*
++   call void @llvm.lifetime.start.p0i8(i64 8, i8* %6) #2
++   store i8* null, i8** %out.i.i, align 8
++   %7 = call i32 @posix_memalign(i8** nonnull %out.i.i, i64 %3, i64 %2) #2
++   %8 = icmp eq i32 %7, 0
++   %9 = load i8*, i8** %out.i.i, align 8
++   %sret_slot.0.i.i = select i1 %8, i8* %9, i8* null
++   call void @llvm.lifetime.end.p0i8(i64 8, i8* %6) #2
++   %10 = icmp ule i64 %2, %1
++   %11 = select i1 %10, i64 %2, i64 %1
++   call void @llvm.memmove.p0i8.p0i8.i64(i8* align 1 %sret_slot.0.i.i, i8* align 1 %0, i64 %11, i1 false)
++   call void @free(i8* %0) #2
++-  br label %_ZN12alloc_system3imp10reallocate17h4a0811c9ec086854E.exit
+++  br label %_ZN12alloc_system3imp10reallocate1l44a0811c9ec086854E.exit
++ 
++-_ZN12alloc_system3imp10reallocate17h4a0811c9ec086854E.exit: ; preds = %_ZN12alloc_system3imp8allocate17h8ba7625cc4a820e8E.exit.i, %then-block-195-.i
+++_ZN12alloc_system3imp10reallocate1l44a0811c9ec086854E.exit: ; preds = %_ZN12alloc_system3imp8allocate17h8ba7625cc4a820e8E.exit.i, %then-block-195-.i
++   %sret_slot.0.i = phi i8* [ %5, %then-block-195-.i ], [ %sret_slot.0.i.i, %_ZN12alloc_system3imp8allocate17h8ba7625cc4a820e8E.exit.i ]
++   ret i8* %sret_slot.0.i
++ }
++ 
++ ; Function Attrs: nounwind readnone uwtable
++ define i64 @__rust_reallocate_inplace(i8* nocapture readnone %0, i64 %1, i64 %2, i64 %3) unnamed_addr #1 {
++ entry-block:
+-- 
+2.26.2
+

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-16 01:20:57 UTC (rev 628144)
+++ PKGBUILD	2020-05-16 01:21:21 UTC (rev 628145)
@@ -1,102 +0,0 @@
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-
-pkgname=diffoscope
-pkgver=143
-pkgrel=1
-pkgdesc='Tool for in-depth comparison of files, archives, and directories'
-url='https://diffoscope.org/'
-arch=('x86_64')
-license=('GPL3')
-depends=('python-magic' 'python-libarchive-c' 'python-setuptools' 'python-distro' 'python-defusedxml'
-         'python-tlsh')
-optdepends=(
-  'acl: access control list utilities support'
-  'binutils: binary utilities support'
-  'binwalk: binwalk support'
-  'bzip2: bzip2 utilities support'
-  'cdrtools: ISO utilities support'
-  'colord: ICC profiles support'
-  'cpio: cpio archive support'
-  'diffutils: diff utilities support'
-  'docx2txt: docx comparing support'
-  'dtc: device tree comparing support'
-  'e2fsprogs: Ext2/3/4 filesystem utilities support'
-  'enjarify: Android dex file support'
-  'hdf5: Hierarchical Data Format support'
-  'imagemagick: ImageMagick identify support'
-  'fpc: Free Pascal utilities support'
-  'java-environment: java utilities support'
-  'libcaca: image compare support'
-  'llvm: LLVM bitcode files support'
-  'lz4: lz4 compression support'
-  'odt2txt: odt comparing support'
-  'fontforge: bitmap font utilities support'
-  'gettext: GNU internationalization utilities support'
-  'ghc: haskell utilities support'
-  'giflib: gifbuild utilities support'
-  'gnupg: GNU privacy guard support'
-  'gnumeric: GNOME Spreadsheet support'
-  'mono: mono support'
-  'openssh: OpenSSH key comparing support'
-  'openssl: .p7c and .p7b certificates. support'
-  'poppler: PDF utilities support'
-  'r: R language support'
-  'sqlite: SQLite support'
-  'squashfs-tools: squashfs filesystem support'
-  #'python-guestfs: guestfs filesystem support'
-  'python-argcomplete: completion support'
-  'python-jsbeautifier: javascript beautifier support'
-  'python-progressbar: show progressbar support'
-  'tcpdump: pcap matching support'
-  'unzip: zip utilities support'
-  'gzip: gzip utilities support'
-  'tar: tar utilities support'
-# 'wabt: webassembly support' unittest fails
-  'xxd: xxd utilities support'
-  'xz: XZ and LZMA utilities support'
-  'zstd: zst compression'
-)
-makedepends=('help2man' 'python-docutils' 'git')
-checkdepends=(
-  'python-pytest' 'python-jsbeautifier' 'python-h5py' 'acl' 'binutils' 'bzip2' 'cdrtools' 'cpio' 'diffutils' 'e2fsprogs' 'enjarify'
-  'hdf5' 'imagemagick' 'java-environment=10' 'fontforge' 'gettext' 'ghc' 'gnupg' 'mono' 'mono-tools' 'poppler' 'sqlite' 'squashfs-tools'
-  'lz4' 'unzip' 'gzip' 'tar' 'tcpdump' 'vim' 'xz' 'llvm' 'colord' 'fpc' 'openssh' 'openssl' 'odt2txt' 'docx2txt' 'r' 'dtc' 'giflib'
-  'gnumeric' 'python-progressbar' 'binwalk' 'python-argcomplete' 'zstd')
-source=(https://diffoscope.org/archive/diffoscope-${pkgver}.tar.bz2{,.asc} 0001-Update-llvm-diff-for-llvm-10.patch)
-sha512sums=('d0be94522b2e5336068af90df562895ffe6f4cf09ef5cbbba47982f29ec8c04a19aaa6429b6a5de5d310fd5a4304757b8d98b5bdee90da9953c22025da566365'
-            'SKIP'
-            '56b3ed348b58da1ab58ee2f01fb2a325a41608f65b3d869d0e2a7e269ddee7428080a059ebe4eb93397b65514243c5d96b95ef075122d05463e2dcd7074762d6')
-b2sums=('e1cdfd38f9a4f305490ff9d09a35e74c3b2101cf84315988a5a0e520a087d7f9877990ce1a3845c38eba0af6901ed05fe5ff5683c9b49134fae9e79f999f0eb5'
-        'SKIP'
-        'ec0e74f3201fe4b2a4514ec4628eaa28bc9d2cb7d24d2f3d8469f27a6eea1863173cbb508c8e86d0c75e1bdecd236d1377dd950e9dc4279ea4a146c8b4abad62')
-validpgpkeys=("C2FE4BD271C139B86C533E461E953E27D4311E58") # "Chris Lamb <chris at chris-lamb.co.uk>"
-
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-  sed '/python-magic/d' -i setup.py
-
-  patch -Np1 -i ${srcdir}/0001-Update-llvm-diff-for-llvm-10.patch
-}
-
-build() {
-  cd ${pkgname}-${pkgver}
-  python setup.py build
-  make -C doc
-}
-
-check() {
-  cd ${pkgname}-${pkgver}
-  PYTHONPATH=".:${PYTHONPATH}" py.test \
-    -k 'not test_ppu and not test_superblock' # unsquashfs output differs from fixture.
-    # ppu bug https://salsa.debian.org/reproducible-builds/diffoscope/issues/9
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  python setup.py install --skip-build -O1 --root="${pkgdir}"
-  install -Dm 644 README.rst -t "${pkgdir}/usr/share/doc/${pkgname}"
-  install -Dm 644 doc/diffoscope.1 -t "${pkgdir}/usr/share/man/man1"
-}
-
-# vim: ts=2 sw=2 et:

Copied: diffoscope/repos/community-x86_64/PKGBUILD (from rev 628144, diffoscope/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-05-16 01:21:21 UTC (rev 628145)
@@ -0,0 +1,102 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+
+pkgname=diffoscope
+pkgver=144
+pkgrel=1
+pkgdesc='Tool for in-depth comparison of files, archives, and directories'
+url='https://diffoscope.org/'
+arch=('x86_64')
+license=('GPL3')
+depends=('python-magic' 'python-libarchive-c' 'python-setuptools' 'python-distro' 'python-defusedxml'
+         'python-tlsh')
+optdepends=(
+  'acl: access control list utilities support'
+  'binutils: binary utilities support'
+  'binwalk: binwalk support'
+  'bzip2: bzip2 utilities support'
+  'cdrtools: ISO utilities support'
+  'colord: ICC profiles support'
+  'cpio: cpio archive support'
+  'diffutils: diff utilities support'
+  'docx2txt: docx comparing support'
+  'dtc: device tree comparing support'
+  'e2fsprogs: Ext2/3/4 filesystem utilities support'
+  'enjarify: Android dex file support'
+  'hdf5: Hierarchical Data Format support'
+  'imagemagick: ImageMagick identify support'
+  'fpc: Free Pascal utilities support'
+  'java-environment: java utilities support'
+  'libcaca: image compare support'
+  'llvm: LLVM bitcode files support'
+  'lz4: lz4 compression support'
+  'odt2txt: odt comparing support'
+  'fontforge: bitmap font utilities support'
+  'gettext: GNU internationalization utilities support'
+  'ghc: haskell utilities support'
+  'giflib: gifbuild utilities support'
+  'gnupg: GNU privacy guard support'
+  'gnumeric: GNOME Spreadsheet support'
+  'mono: mono support'
+  'openssh: OpenSSH key comparing support'
+  'openssl: .p7c and .p7b certificates. support'
+  'poppler: PDF utilities support'
+  'r: R language support'
+  'sqlite: SQLite support'
+  'squashfs-tools: squashfs filesystem support'
+  #'python-guestfs: guestfs filesystem support'
+  'python-argcomplete: completion support'
+  'python-jsbeautifier: javascript beautifier support'
+  'python-progressbar: show progressbar support'
+  'tcpdump: pcap matching support'
+  'unzip: zip utilities support'
+  'gzip: gzip utilities support'
+  'tar: tar utilities support'
+# 'wabt: webassembly support' unittest fails
+  'xxd: xxd utilities support'
+  'xz: XZ and LZMA utilities support'
+  'zstd: zst compression'
+)
+makedepends=('help2man' 'python-docutils' 'git')
+checkdepends=(
+  'python-pytest' 'python-jsbeautifier' 'python-h5py' 'acl' 'binutils' 'bzip2' 'cdrtools' 'cpio' 'diffutils' 'e2fsprogs' 'enjarify'
+  'hdf5' 'imagemagick' 'java-environment=10' 'fontforge' 'gettext' 'ghc' 'gnupg' 'mono' 'mono-tools' 'poppler' 'sqlite' 'squashfs-tools'
+  'lz4' 'unzip' 'gzip' 'tar' 'tcpdump' 'vim' 'xz' 'llvm' 'colord' 'fpc' 'openssh' 'openssl' 'odt2txt' 'docx2txt' 'r' 'dtc' 'giflib'
+  'gnumeric' 'python-progressbar' 'binwalk' 'python-argcomplete' 'zstd')
+source=(https://diffoscope.org/archive/diffoscope-${pkgver}.tar.bz2{,.asc} 0001-Update-llvm-diff-for-llvm-10.patch)
+sha512sums=('7d79a7298f27990ac519b39261fb1c815523a9acb7adc29097d3ff4a690ca172e3ce7ef56d5d4e89231579ce09865aa66effa157d87651027923ec8a7f10babb'
+            'SKIP'
+            '56b3ed348b58da1ab58ee2f01fb2a325a41608f65b3d869d0e2a7e269ddee7428080a059ebe4eb93397b65514243c5d96b95ef075122d05463e2dcd7074762d6')
+b2sums=('be1525096f05324d594f901ddc10776200805eade365f424630a415bb0046a4214239358fc15105e8c05aae87023b68298b1cfe04048ff3b3ff6f4365dc8bcf4'
+        'SKIP'
+        'ec0e74f3201fe4b2a4514ec4628eaa28bc9d2cb7d24d2f3d8469f27a6eea1863173cbb508c8e86d0c75e1bdecd236d1377dd950e9dc4279ea4a146c8b4abad62')
+validpgpkeys=("C2FE4BD271C139B86C533E461E953E27D4311E58") # "Chris Lamb <chris at chris-lamb.co.uk>"
+
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  sed '/python-magic/d' -i setup.py
+
+  #patch -Np1 -i ${srcdir}/0001-Update-llvm-diff-for-llvm-10.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  python setup.py build
+  make -C doc
+}
+
+check() {
+  cd ${pkgname}-${pkgver}
+  PYTHONPATH=".:${PYTHONPATH}" py.test \
+    -k 'not test_ppu and not test_superblock' # unsquashfs output differs from fixture.
+    # ppu bug https://salsa.debian.org/reproducible-builds/diffoscope/issues/9
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  python setup.py install --skip-build -O1 --root="${pkgdir}"
+  install -Dm 644 README.rst -t "${pkgdir}/usr/share/doc/${pkgname}"
+  install -Dm 644 doc/diffoscope.1 -t "${pkgdir}/usr/share/man/man1"
+}
+
+# vim: ts=2 sw=2 et:


More information about the arch-commits mailing list