New commits:
commit 4ef68319f8ba8d84fd560de80ecb652dbb4548b1
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
btrfstools: drop obsolete setuptools sub-dependency
commit aa3e642c625b992595910aafa8ca2a3850682be0
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
valgrind: version 3.16.1
commit f9349ce4743d31082f18b193174d35089fce69b3
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
installwatch: only wrap potential write operations
Installing rust got installwatch into a deadlock because of jemalloc
calling
readlink(), which was wrapperd by installwatch, which in turn caused
memory
allocation calls within jemalloc.
For tracking installed files, wrapping only functions that create/change
file
systems does make sense, doesn't it?
commit 8cc151f1b9e686fb96b375815f4a34d0fbf2fe9a
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
valgrind: fix build with MPI, make it also optional
diff --git a/devel/valgrind/12_drop-MPI-1-support.patch
b/devel/valgrind/12_drop-MPI-1-support.patch
new file mode 100644
index 0000000..0fedae9
--- /dev/null
+++ b/devel/valgrind/12_drop-MPI-1-support.patch
@@ -0,0 +1,66 @@
+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
diff --git a/devel/valgrind/DEPENDS b/devel/valgrind/DEPENDS
index a9d2477..a7d0ee0 100755
--- a/devel/valgrind/DEPENDS
+++ b/devel/valgrind/DEPENDS
@@ -1,6 +1,7 @@
depends glibc &&
optional_depends boost "" "" "boost support" &&
+optional_depends openmpi "--with-mpicc=mpicc" "--without-mpicc" "MPI
support" &&
if [[ $VALGRIND_BRANCH == scm ]]
then
depends automake &&
diff --git a/devel/valgrind/DETAILS b/devel/valgrind/DETAILS
index 8d84215..cce905b 100755
--- a/devel/valgrind/DETAILS
+++ b/devel/valgrind/DETAILS
@@ -9,13 +9,12 @@ then
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
else
- VERSION=3.11.0
- PATCHLEVEL=1
+ VERSION=3.16.1
# Upstream offers an MD5 hash. Could use that for UPSTREAM_HASH.
# But MD5 is so broken that I'd rather not use it.
-
SOURCE_HASH=sha512:a25f97fa80aef4ad1e86b303886cd7a97aac248820a4c24e3d3dc26567dd7d2d86db237866468fd43885a9fb8534cb0a8e301a3c752fffbc231a2842272999da
+
SOURCE_HASH=sha512:2a4173efe1b6facdd2f5c5ee8ed006704168eba1813736fccc8191d60363afd96197512cf42037e65f18d4ddd49adc74a54c47210df216fba3c46bf68ef0f950
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_URL[0]=http://valgrind.org/downloads/$SOURCE
+ SOURCE_URL[0]=https://sourceware.org/pub/valgrind/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
fi
LICENSE[0]=GPL
diff --git a/devel/valgrind/HISTORY b/devel/valgrind/HISTORY
index ed552fa..d3ea5cd 100644
--- a/devel/valgrind/HISTORY
+++ b/devel/valgrind/HISTORY
@@ -1,3 +1,9 @@
+2020-08-31 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 3.16.1
+ * glibc.patch, valgrind-3.11.0-boost.patch: removed
+ * 12_drop-MPI-1-support.patch, PRE_BUILD: import Debian patch to kill
MPI-1
+ usage (fails to build otherwise)
+
2016-03-20 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* DEPENDS: added glibc
diff --git a/devel/valgrind/PRE_BUILD b/devel/valgrind/PRE_BUILD
index ee83bc3..645b8e4 100755
--- a/devel/valgrind/PRE_BUILD
+++ b/devel/valgrind/PRE_BUILD
@@ -1,7 +1,7 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&