[arch-commits] Commit in valgrind/repos/extra-x86_64 (5 files)

Antonio Rojas arojas at gemini.archlinux.org
Sun Dec 26 11:13:55 UTC 2021


    Date: Sunday, December 26, 2021 @ 11:13:55
  Author: arojas
Revision: 433132

archrelease: copy trunk to extra-x86_64

Added:
  valgrind/repos/extra-x86_64/PKGBUILD
    (from rev 433131, valgrind/trunk/PKGBUILD)
  valgrind/repos/extra-x86_64/valgrind-3.7.0-respect-flags.patch
    (from rev 433131, valgrind/trunk/valgrind-3.7.0-respect-flags.patch)
Deleted:
  valgrind/repos/extra-x86_64/PKGBUILD
  valgrind/repos/extra-x86_64/valgrind-3.16-openmpi-4.0.patch
  valgrind/repos/extra-x86_64/valgrind-3.7.0-respect-flags.patch

------------------------------------+
 PKGBUILD                           |  214 +++++++++++++++++------------------
 valgrind-3.16-openmpi-4.0.patch    |   67 ----------
 valgrind-3.7.0-respect-flags.patch |   26 ++--
 3 files changed, 121 insertions(+), 186 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-26 11:13:38 UTC (rev 433131)
+++ PKGBUILD	2021-12-26 11:13:55 UTC (rev 433132)
@@ -1,106 +0,0 @@
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Contributor: Dan McGee <dan at archlinux.org>
-# Contributor: Allan McRae <allan at archlinux.org>
-
-pkgname=valgrind
-pkgver=3.17.0
-pkgrel=1
-pkgdesc='Tool to help find memory-management problems in programs'
-arch=('x86_64')
-license=('GPL')
-url='http://valgrind.org/'
-depends=('glibc' 'perl')
-makedepends=('gdb' 'lib32-glibc' 'lib32-gcc-libs' 'docbook-xml'
-             'docbook-xsl' 'docbook-sgml')
-checkdepends=('procps-ng')
-optdepends=('lib32-glibc: 32-bit ABI support')
-provides=('valgrind-multilib')
-replaces=('valgrind-multilib')
-options=('!emptydirs' '!strip')
-source=(https://sourceware.org/pub/valgrind/valgrind-${pkgver}.tar.bz2{,.asc}
-        valgrind-3.7.0-respect-flags.patch)
-validpgpkeys=(
-  0E9FFD0C16A1856CF9C7C690BA0166E698FA6035 # Julian Seward <jseward at acm.org>
-)
-sha512sums=('94de78942a7059e1ab84d1c0c0b8f3efd1c2d15c70b97bc7edc8136812778adb6f8187149d53a60a8c6a7c8b40534f9be5cfed0eb3c0c314545b681f950b108f'
-            'SKIP'
-            'e0cec39381cefeca09ae4794cca309dfac7c8693e6315e137e64f5c33684598726d41cfbb4edf764fe985503b13ff596184ca5fc32b159d500ec092e4cf8838c')
-b2sums=('96569db9bc3c25ca195a4caa64da6e96b9bff7edd82727fccccaa8307162e29f4e150386c7c9611152fc1afde609d0922aa84067957b72dff03810ee23045e9c'
-        'SKIP'
-        'af556fdf3c02e37892bfe9afebc954cf2f1b2fa9b75c1caacfa9f3b456ebc02bf078475f9ee30079b3af5d150d41415a947c3d04235c1ea8412cf92b959c484a')
-
-prepare() {
-  cd valgrind-${pkgver}
-  patch -Np1 < ../valgrind-3.7.0-respect-flags.patch
-  sed -i 's|sgml/docbook/xsl-stylesheets|xml/docbook/xsl-stylesheets-1.79.2-nons|' docs/Makefile.am
-
-  autoreconf -ifv
-}
-
-build() {
-  # valgrind does not like some of our flags
-  CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2/}
-  CFLAGS=${CFLAGS/-fno-plt/}
-  CXXFLAGS=${CXXFLAGS/-fno-plt/}
-
-  cd valgrind-${pkgver}
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --libexecdir=/usr/lib \
-    --mandir=/usr/share/man
-  make
-  make -C docs man-pages
-}
-
-check() {
-  cd valgrind-${pkgver}
-
-  # Make sure a basic binary runs. There should be no errors.
-  ./vg-in-place --error-exitcode=1 /bin/true
-
-  # Make sure no extra FLAGS leak through, the testsuite
-  # sets all flags necessary. See also configure above.
-  make check CPPFLAGS= CFLAGS= CXXFLAGS= LDFLAGS=
-
-  # XXX: run full regtest but only report issues some tests fail duo
-  # current toolchain and expectations, take a manual look if its fine
-  #echo "===============TESTING==================="
-  #make regtest || true
-
-  # Make sure test failures show up in build.log
-  # Gather up the diffs (at most the first 20 lines for each one)
-  #local f max_lines=20 diff_files=()
-  #mapfile -d '' diff_files < <(find . -name '*.diff' -print0 | sort -z)
-  #if (( ${#diff_files[@]} == 0 )); then
-    #echo "Congratulations, all tests passed!"
-  #else
-    #warning "Some tests failed!"
-    #for f in "${diff_files[@]}"; do
-        #echo "================================================="
-        #echo "${f}"
-        #echo "================================================="
-        #if (( $(wc -l < "${f}") < ${max_lines} )); then
-          #cat "${f}"
-        #else
-          #head -n ${max_lines} "${f}"
-          #echo "<truncated beyond ${max_lines} lines>"
-        #fi
-    #done | tee diffs
-  #fi
-  #echo "===============END TESTING==============="
-}
-
-package() {
-  cd valgrind-${pkgver}
-  make DESTDIR="${pkgdir}" install
-
-  install -Dm644 docs/*.1 -t "$pkgdir/usr/share/man/man1"
-
-  if check_option 'debug' n; then
-    find "${pkgdir}/usr/bin" -type f -executable -exec strip $STRIP_BINARIES {} + || :
-  fi
-}
-
-# vim: ts=2 sw=2 et:

Copied: valgrind/repos/extra-x86_64/PKGBUILD (from rev 433131, valgrind/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-12-26 11:13:55 UTC (rev 433132)
@@ -0,0 +1,108 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Dan McGee <dan at archlinux.org>
+# Contributor: Allan McRae <allan at archlinux.org>
+
+pkgname=valgrind
+pkgver=3.18.1
+pkgrel=1
+pkgdesc='Tool to help find memory-management problems in programs'
+arch=('x86_64')
+license=('GPL')
+url='http://valgrind.org/'
+depends=('glibc' 'perl')
+makedepends=('gdb' 'lib32-glibc' 'lib32-gcc-libs' 'docbook-xml'
+             'docbook-xsl' 'docbook-sgml')
+checkdepends=('procps-ng')
+optdepends=('lib32-glibc: 32-bit ABI support')
+provides=('valgrind-multilib')
+replaces=('valgrind-multilib')
+options=('!emptydirs' '!strip')
+source=(https://sourceware.org/pub/valgrind/valgrind-${pkgver}.tar.bz2{,.asc}
+        valgrind-3.7.0-respect-flags.patch)
+validpgpkeys=(
+  0E9FFD0C16A1856CF9C7C690BA0166E698FA6035 # Julian Seward <jseward at acm.org>
+  EC3CFE88F6CA0788774F5C1D1AA44BE649DE760A # Mark Wielaard <mjw at gnu.org>
+)
+sha512sums=('a03b5cd7eafab4a1cea07f46464c1546ae1cb3d106649626b1e55658badf90e58d1f3854a38a33d5dffd8237f5555ae7e1f27a4b40e06254f87825c7fc61b59b'
+            'SKIP'
+            'e0cec39381cefeca09ae4794cca309dfac7c8693e6315e137e64f5c33684598726d41cfbb4edf764fe985503b13ff596184ca5fc32b159d500ec092e4cf8838c')
+b2sums=('a98322e4c12ae1bc495659217bd398b85e459288e775ba5f543b9ce1faa5bdfc17791178c0e7b9703a31588cc4c7cbde814b7a43b2ec76e7362e2aeeb100d935'
+        'SKIP'
+        'af556fdf3c02e37892bfe9afebc954cf2f1b2fa9b75c1caacfa9f3b456ebc02bf078475f9ee30079b3af5d150d41415a947c3d04235c1ea8412cf92b959c484a')
+options=(!lto) # https://bugs.kde.org/show_bug.cgi?id=338252
+
+prepare() {
+  cd valgrind-${pkgver}
+  patch -Np1 < ../valgrind-3.7.0-respect-flags.patch
+  sed -i 's|sgml/docbook/xsl-stylesheets|xml/docbook/xsl-stylesheets-1.79.2-nons|' docs/Makefile.am
+
+  autoreconf -ifv
+}
+
+build() {
+  # valgrind does not like some of our flags
+  CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2/}
+  CFLAGS=${CFLAGS/-fno-plt/}
+  CXXFLAGS=${CXXFLAGS/-fno-plt/}
+
+  cd valgrind-${pkgver}
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --libexecdir=/usr/lib \
+    --mandir=/usr/share/man
+  make
+  make -C docs man-pages
+}
+
+check() {
+  cd valgrind-${pkgver}
+
+  # Make sure a basic binary runs. There should be no errors.
+  ./vg-in-place --error-exitcode=1 /bin/true
+
+  # Make sure no extra FLAGS leak through, the testsuite
+  # sets all flags necessary. See also configure above.
+  make check CPPFLAGS= CFLAGS= CXXFLAGS= LDFLAGS=
+
+  # XXX: run full regtest but only report issues some tests fail duo
+  # current toolchain and expectations, take a manual look if its fine
+  #echo "===============TESTING==================="
+  #make regtest || true
+
+  # Make sure test failures show up in build.log
+  # Gather up the diffs (at most the first 20 lines for each one)
+  #local f max_lines=20 diff_files=()
+  #mapfile -d '' diff_files < <(find . -name '*.diff' -print0 | sort -z)
+  #if (( ${#diff_files[@]} == 0 )); then
+    #echo "Congratulations, all tests passed!"
+  #else
+    #warning "Some tests failed!"
+    #for f in "${diff_files[@]}"; do
+        #echo "================================================="
+        #echo "${f}"
+        #echo "================================================="
+        #if (( $(wc -l < "${f}") < ${max_lines} )); then
+          #cat "${f}"
+        #else
+          #head -n ${max_lines} "${f}"
+          #echo "<truncated beyond ${max_lines} lines>"
+        #fi
+    #done | tee diffs
+  #fi
+  #echo "===============END TESTING==============="
+}
+
+package() {
+  cd valgrind-${pkgver}
+  make DESTDIR="${pkgdir}" install
+
+  install -Dm644 docs/*.1 -t "$pkgdir/usr/share/man/man1"
+
+  if check_option 'debug' n; then
+    find "${pkgdir}/usr/bin" -type f -executable -exec strip $STRIP_BINARIES {} + || :
+  fi
+}
+
+# vim: ts=2 sw=2 et:

Deleted: valgrind-3.16-openmpi-4.0.patch
===================================================================
--- valgrind-3.16-openmpi-4.0.patch	2021-12-26 11:13:38 UTC (rev 433131)
+++ valgrind-3.16-openmpi-4.0.patch	2021-12-26 11:13:55 UTC (rev 433132)
@@ -1,67 +0,0 @@
-From a3262243ca01f7cfe3ae86b168d5b3a7e5d1cbc0 Mon Sep 17 00:00:00 2001
-From: Balint Reczey <balint.reczey at canonical.com>
-Date: Thu, 28 Nov 2019 19:31:12 +0100
-Subject: [PATCH] Drop MPI 1 support
-
-Signed-off-by: Balint Reczey <balint.reczey at canonical.com>
----
- mpi/libmpiwrap.c | 16 ++--------------
- 1 file changed, 2 insertions(+), 14 deletions(-)
-
-diff --git a/mpi/libmpiwrap.c b/mpi/libmpiwrap.c
-index 488bb13fd..a740ea562 100644
---- a/mpi/libmpiwrap.c
-+++ b/mpi/libmpiwrap.c
-@@ -278,8 +278,6 @@ static void showTy ( FILE* f, MPI_Datatype ty )
-    else if (ty == MPI_LONG_INT)       fprintf(f,"LONG_INT");
-    else if (ty == MPI_SHORT_INT)      fprintf(f,"SHORT_INT");
-    else if (ty == MPI_2INT)           fprintf(f,"2INT");
--   else if (ty == MPI_UB)             fprintf(f,"UB");
--   else if (ty == MPI_LB)             fprintf(f,"LB");
- #  if defined(MPI_WCHAR)
-    else if (ty == MPI_WCHAR)          fprintf(f,"WCHAR");
- #  endif
-@@ -350,20 +348,11 @@ static void showCombiner ( FILE* f, int combiner )
- #     endif
-       case MPI_COMBINER_CONTIGUOUS:  fprintf(f, "CONTIGUOUS"); break;
-       case MPI_COMBINER_VECTOR:      fprintf(f, "VECTOR"); break;
--#if   defined(MPI_COMBINER_HVECTOR_INTEGER)
--      case MPI_COMBINER_HVECTOR_INTEGER: fprintf(f, "HVECTOR_INTEGER"); break;
--#     endif
-       case MPI_COMBINER_HVECTOR:     fprintf(f, "HVECTOR"); break;
-       case MPI_COMBINER_INDEXED:     fprintf(f, "INDEXED"); break;
--#if   defined(MPI_COMBINER_HINDEXED_INTEGER)
--      case MPI_COMBINER_HINDEXED_INTEGER: fprintf(f, "HINDEXED_INTEGER"); break;
--#     endif
-       case MPI_COMBINER_HINDEXED:    fprintf(f, "HINDEXED"); break;
- #if   defined(MPI_COMBINER_INDEXED_BLOCK)
-       case MPI_COMBINER_INDEXED_BLOCK: fprintf(f, "INDEXED_BLOCK"); break;
--#     endif
--#if   defined(MPI_COMBINER_STRUCT_INTEGER)
--      case MPI_COMBINER_STRUCT_INTEGER: fprintf(f, "STRUCT_INTEGER"); break;
- #     endif
-       case MPI_COMBINER_STRUCT:      fprintf(f, "STRUCT"); break;
- #if   defined(MPI_COMBINER_SUBARRAY)
-@@ -458,8 +447,9 @@ Bool isMSI ( MPI_Status* status )
- static long extentOfTy ( MPI_Datatype ty )
- {
-    int      r;
-+   MPI_Aint lb;
-    MPI_Aint n;
--   r = PMPI_Type_extent(ty, &n);
-+   r = MPI_Type_get_extent(ty, &lb, &n);
-    assert(r == MPI_SUCCESS);
-    return (long)n;
- }
-@@ -733,8 +723,6 @@ void walk_type ( void(*f)(void*,long), char* base, MPI_Datatype ty )
-          f(base + offsetof(Ty,loc), sizeof(int));
-          return;
-       }
--      if (ty == MPI_LB || ty == MPI_UB)
--         return; /* have zero size, so nothing needs to be done */
-       goto unhandled;
-       /*NOTREACHED*/
-    }
--- 
-2.17.1
-

Deleted: valgrind-3.7.0-respect-flags.patch
===================================================================
--- valgrind-3.7.0-respect-flags.patch	2021-12-26 11:13:38 UTC (rev 433131)
+++ valgrind-3.7.0-respect-flags.patch	2021-12-26 11:13:55 UTC (rev 433132)
@@ -1,13 +0,0 @@
-diff -Naur valgrind-3.7.0.orig//mpi/Makefile.am valgrind-3.7.0/mpi/Makefile.am
---- valgrind-3.7.0.orig/mpi/Makefile.am	2011-10-26 17:24:23.000000000 -0400
-+++ valgrind-3.7.0/mpi/Makefile.am	2011-11-10 16:03:14.000000000 -0500
-@@ -7,9 +7,6 @@
- CC = $(MPI_CC)
- DEFS =
- DEFAULT_INCLUDES =
--CPPFLAGS =
--CFLAGS =
--LDFLAGS =
- 
- EXTRA_DIST = \
- 	mpiwrap_type_test.c

Copied: valgrind/repos/extra-x86_64/valgrind-3.7.0-respect-flags.patch (from rev 433131, valgrind/trunk/valgrind-3.7.0-respect-flags.patch)
===================================================================
--- valgrind-3.7.0-respect-flags.patch	                        (rev 0)
+++ valgrind-3.7.0-respect-flags.patch	2021-12-26 11:13:55 UTC (rev 433132)
@@ -0,0 +1,13 @@
+diff -Naur valgrind-3.7.0.orig//mpi/Makefile.am valgrind-3.7.0/mpi/Makefile.am
+--- valgrind-3.7.0.orig/mpi/Makefile.am	2011-10-26 17:24:23.000000000 -0400
++++ valgrind-3.7.0/mpi/Makefile.am	2011-11-10 16:03:14.000000000 -0500
+@@ -7,9 +7,6 @@
+ CC = $(MPI_CC)
+ DEFS =
+ DEFAULT_INCLUDES =
+-CPPFLAGS =
+-CFLAGS =
+-LDFLAGS =
+ 
+ EXTRA_DIST = \
+ 	mpiwrap_type_test.c



More information about the arch-commits mailing list