mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-09-19 22:08:32 +00:00
extra/valgrind to 3.16.1-2
This commit is contained in:
Kevin Mihelich
parent
0b7f24030f
commit
f3f6dcadbc
|
|
@ -8,11 +8,11 @@
|
|||
# - removed lib32 package make/optdepends
|
||||
|
||||
buildarch=12
|
||||
noautobuild=1
|
||||
#noautobuild=1
|
||||
|
||||
pkgname=valgrind
|
||||
pkgver=3.16.1
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc='Tool to help find memory-management problems in programs'
|
||||
arch=('x86_64')
|
||||
license=('GPL')
|
||||
|
|
@ -26,6 +26,7 @@ replaces=('valgrind-multilib')
|
|||
options=('!emptydirs' '!strip')
|
||||
source=(https://sourceware.org/pub/valgrind/valgrind-${pkgver}.tar.bz2{,.asc}
|
||||
valgrind-3.7.0-respect-flags.patch
|
||||
valgrind-3.16-openmpi-4.0.patch
|
||||
valgrind-3.13.0-arm64-hwcap.patch)
|
||||
validpgpkeys=(
|
||||
0E9FFD0C16A1856CF9C7C690BA0166E698FA6035 # Julian Seward <jseward@acm.org>
|
||||
|
|
@ -33,18 +34,21 @@ validpgpkeys=(
|
|||
sha512sums=('2a4173efe1b6facdd2f5c5ee8ed006704168eba1813736fccc8191d60363afd96197512cf42037e65f18d4ddd49adc74a54c47210df216fba3c46bf68ef0f950'
|
||||
'SKIP'
|
||||
'e0cec39381cefeca09ae4794cca309dfac7c8693e6315e137e64f5c33684598726d41cfbb4edf764fe985503b13ff596184ca5fc32b159d500ec092e4cf8838c'
|
||||
'65157c991c342953b838632bd1494ac101d26a5c7bef412606f20a18c42c0448c092a983436bf8d73af6f9518471c3ed26ddd7e37e3157a235bc001dffdad7e7'
|
||||
'5af853399c6abdf8016fd1c2be854b3952b7d7e9ca16c870f84eed72e606e639d5f64de32e60105899f5201b53156380ae460111e05209e843301492742c9bfd')
|
||||
b2sums=('1c333c26827f7a8356869e8758da9dd6a7444642ac4f6377c84fdab8349b9cee1e9bf2cf2eb86043c4feffab342dd97da20e76d7566d0296189e6ea8483a8c65'
|
||||
'SKIP'
|
||||
'af556fdf3c02e37892bfe9afebc954cf2f1b2fa9b75c1caacfa9f3b456ebc02bf078475f9ee30079b3af5d150d41415a947c3d04235c1ea8412cf92b959c484a'
|
||||
'28d3a259a96fb4a1c4417674f587058a65b5e5c4e0f3a88d443d2ba36da71273bcfbf01947de0fa523813f627a439f539d6139eb9c9ebede96a002310de0d0c1'
|
||||
'ff8cf51a6034c13ffbc412c387e83a32fa59f96e01be8faf6b52aa6d55bd5e5836c16d75f2291d87450709d0c75689b21870514006c603c6419940a9b977e609')
|
||||
|
||||
|
||||
prepare() {
|
||||
cd valgrind-${pkgver}
|
||||
patch -Np1 < ../valgrind-3.7.0-respect-flags.patch
|
||||
patch -Np1 < ../valgrind-3.16-openmpi-4.0.patch
|
||||
patch -Np1 < ../valgrind-3.13.0-arm64-hwcap.patch
|
||||
sed -i 's|sgml/docbook/xsl-stylesheets|xml/docbook/xsl-stylesheets-1.79.2|' docs/Makefile.am
|
||||
sed -i 's|sgml/docbook/xsl-stylesheets|xml/docbook/xsl-stylesheets-1.79.2-nons|' docs/Makefile.am
|
||||
|
||||
autoreconf -ifv
|
||||
}
|
||||
|
|
|
|||
67
extra/valgrind/valgrind-3.16-openmpi-4.0.patch
Normal file
67
extra/valgrind/valgrind-3.16-openmpi-4.0.patch
Normal file
|
|
@ -0,0 +1,67 @@
|
|||
From a3262243ca01f7cfe3ae86b168d5b3a7e5d1cbc0 Mon Sep 17 00:00:00 2001
|
||||
From: Balint Reczey <balint.reczey@canonical.com>
|
||||
Date: Thu, 28 Nov 2019 19:31:12 +0100
|
||||
Subject: [PATCH] Drop MPI 1 support
|
||||
|
||||
Signed-off-by: Balint Reczey <balint.reczey@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
|
||||
|
||||
Loading…
Reference in a new issue