diff --git a/extra/valgrind/PKGBUILD b/extra/valgrind/PKGBUILD index 1da3cd408..7bb1fab7b 100644 --- a/extra/valgrind/PKGBUILD +++ b/extra/valgrind/PKGBUILD @@ -11,7 +11,7 @@ buildarch=12 noautobuild=1 pkgname=valgrind -pkgver=3.17.0 +pkgver=3.18.1 pkgrel=1 pkgdesc='Tool to help find memory-management problems in programs' arch=('x86_64') @@ -29,16 +29,17 @@ source=(https://sourceware.org/pub/valgrind/valgrind-${pkgver}.tar.bz2{,.asc} valgrind-3.13.0-arm64-hwcap.patch) validpgpkeys=( 0E9FFD0C16A1856CF9C7C690BA0166E698FA6035 # Julian Seward + EC3CFE88F6CA0788774F5C1D1AA44BE649DE760A # Mark Wielaard ) -sha512sums=('94de78942a7059e1ab84d1c0c0b8f3efd1c2d15c70b97bc7edc8136812778adb6f8187149d53a60a8c6a7c8b40534f9be5cfed0eb3c0c314545b681f950b108f' +sha512sums=('a03b5cd7eafab4a1cea07f46464c1546ae1cb3d106649626b1e55658badf90e58d1f3854a38a33d5dffd8237f5555ae7e1f27a4b40e06254f87825c7fc61b59b' 'SKIP' 'e0cec39381cefeca09ae4794cca309dfac7c8693e6315e137e64f5c33684598726d41cfbb4edf764fe985503b13ff596184ca5fc32b159d500ec092e4cf8838c' '5af853399c6abdf8016fd1c2be854b3952b7d7e9ca16c870f84eed72e606e639d5f64de32e60105899f5201b53156380ae460111e05209e843301492742c9bfd') -b2sums=('96569db9bc3c25ca195a4caa64da6e96b9bff7edd82727fccccaa8307162e29f4e150386c7c9611152fc1afde609d0922aa84067957b72dff03810ee23045e9c' +b2sums=('a98322e4c12ae1bc495659217bd398b85e459288e775ba5f543b9ce1faa5bdfc17791178c0e7b9703a31588cc4c7cbde814b7a43b2ec76e7362e2aeeb100d935' 'SKIP' 'af556fdf3c02e37892bfe9afebc954cf2f1b2fa9b75c1caacfa9f3b456ebc02bf078475f9ee30079b3af5d150d41415a947c3d04235c1ea8412cf92b959c484a' 'ff8cf51a6034c13ffbc412c387e83a32fa59f96e01be8faf6b52aa6d55bd5e5836c16d75f2291d87450709d0c75689b21870514006c603c6419940a9b977e609') - +options=(!lto) # https://bugs.kde.org/show_bug.cgi?id=338252 prepare() { cd valgrind-${pkgver} diff --git a/extra/valgrind/valgrind-3.16-openmpi-4.0.patch b/extra/valgrind/valgrind-3.16-openmpi-4.0.patch deleted file mode 100644 index 084ba67b3..000000000 --- a/extra/valgrind/valgrind-3.16-openmpi-4.0.patch +++ /dev/null @@ -1,67 +0,0 @@ -From a3262243ca01f7cfe3ae86b168d5b3a7e5d1cbc0 Mon Sep 17 00:00:00 2001 -From: Balint Reczey -Date: Thu, 28 Nov 2019 19:31:12 +0100 -Subject: [PATCH] Drop MPI 1 support - -Signed-off-by: Balint Reczey ---- - 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 -