sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Ismael Luceno (4fc47f9fd9fb2bf1d5ceecce056e1eaa374a78d8)

From: Ismael Luceno <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (4fc47f9fd9fb2bf1d5ceecce056e1eaa374a78d8)
Date: Wed, 11 Aug 2021 22:27:51 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

devel/valgrind/12_drop-MPI-1-support.patch
| 66 ----------
devel/valgrind/DETAILS
| 4
devel/valgrind/HISTORY
| 7 +
devel/valgrind/PRE_BUILD
| 3

devel/valgrind/patches/0001-Bug-408663---Patch--Suppression-file-for-musl-libc.patch
| 65 +++++++++
5 files changed, 75 insertions(+), 70 deletions(-)

New commits:
commit 4fc47f9fd9fb2bf1d5ceecce056e1eaa374a78d8
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

valgrind 3.17.0

diff --git a/devel/valgrind/12_drop-MPI-1-support.patch
b/devel/valgrind/12_drop-MPI-1-support.patch
deleted file mode 100644
index 0fedae9..0000000
--- a/devel/valgrind/12_drop-MPI-1-support.patch
+++ /dev/null
@@ -1,66 +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
diff --git a/devel/valgrind/DETAILS b/devel/valgrind/DETAILS
index cce905b..c055d75 100755
--- a/devel/valgrind/DETAILS
+++ b/devel/valgrind/DETAILS
@@ -9,10 +9,10 @@ then
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
else
- VERSION=3.16.1
+ VERSION=3.17.0
# 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:2a4173efe1b6facdd2f5c5ee8ed006704168eba1813736fccc8191d60363afd96197512cf42037e65f18d4ddd49adc74a54c47210df216fba3c46bf68ef0f950
+
SOURCE_HASH=sha512:94de78942a7059e1ab84d1c0c0b8f3efd1c2d15c70b97bc7edc8136812778adb6f8187149d53a60a8c6a7c8b40534f9be5cfed0eb3c0c314545b681f950b108f
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=https://sourceware.org/pub/valgrind/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/devel/valgrind/HISTORY b/devel/valgrind/HISTORY
index 38ba2a9..8f268f7 100644
--- a/devel/valgrind/HISTORY
+++ b/devel/valgrind/HISTORY
@@ -1,3 +1,10 @@
+2021-08-11 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 3.17.0
+ * PRE_BUILD, 12_drop-MPI-1-support.patch: patch removed, no longer
needed
+ * PRE_BUILD,
+
patches/0001-Bug-408663---Patch--Suppression-file-for-musl-libc.patch:
+ fixed build aganist musl
+
2020-11-07 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: removed glibc

diff --git a/devel/valgrind/PRE_BUILD b/devel/valgrind/PRE_BUILD
index 645b8e4..fbc5807 100755
--- a/devel/valgrind/PRE_BUILD
+++ b/devel/valgrind/PRE_BUILD
@@ -1,7 +1,6 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-
-patch -p1 < "$SCRIPT_DIRECTORY/12_drop-MPI-1-support.patch" &&
+apply_patch_dir patches &&

if [[ $VALGRIND_BRANCH == "scm" ]]; then
NOCONFIGURE=Y ./autogen.sh
diff --git
a/devel/valgrind/patches/0001-Bug-408663---Patch--Suppression-file-for-musl-libc.patch

b/devel/valgrind/patches/0001-Bug-408663---Patch--Suppression-file-for-musl-libc.patch
new file mode 100644
index 0000000..514e8d7
--- /dev/null
+++
b/devel/valgrind/patches/0001-Bug-408663---Patch--Suppression-file-for-musl-libc.patch
@@ -0,0 +1,65 @@
+From f4d98ff79d5a79102b777ea7e23002d9f7326489 Mon Sep 17 00:00:00 2001
+From: Paul Floyd <pjfloyd AT wanadoo.fr>
+Date: Tue, 8 Dec 2020 15:07:29 +0100
+Subject: [PATCH] Bug 408663 - Patch: Suppression file for musl libc
+
+Origin: Upstream
+Upstream-Status: Backport
+[ismael AT iodev.co.uk: For some reason the file is missing in the tarball]
+---
+ musl.supp | 46 ++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 46 insertions(+)
+ create mode 100644 musl.supp
+
+diff --git a/musl.supp b/musl.supp
+new file mode 100644
+index 000000000..864172a24
+--- /dev/null
++++ b/musl.supp
+@@ -0,0 +1,46 @@
++# Suppressions for musl libc
++# See: https://www.openwall.com/lists/musl/2017/06/15/4
++
++{
++ musl-dynlink-false-positive1
++ Memcheck:Leak
++ fun:calloc
++ fun:load_direct_deps
++ fun:load_deps
++ fun:load_deps
++ fun:__dls3
++ fun:__dls2b
++ fun:__dls2
++}
++
++{
++ musl-dynlink-false-positive2
++ Memcheck:Leak
++ fun:calloc
++ fun:load_direct_deps
++ fun:load_deps
++ fun:load_deps
++ fun:__dls3
++ fun:__dls2
++}
++
++{
++ musl-dynlink-false-positive3
++ Memcheck:Leak
++ fun:calloc
++ fun:load_library
++ fun:load_preload
++ fun:__dls3
++ fun:__dls2b
++ fun:__dls2
++}
++
++{
++ musl-dynlink-false-positive4
++ Memcheck:Leak
++ fun:calloc
++ fun:load_library
++ fun:load_preload
++ fun:__dls3
++ fun:__dls2
++}

[SM-Commit] GIT changes to master grimoire by Ismael Luceno (4fc47f9fd9fb2bf1d5ceecce056e1eaa374a78d8), Ismael Luceno, 08/11/2021