teldra/vp-build
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3122 from Duncaen/valgrind

Browse Source 
valgrind: unbreak musl
This commit is contained in:
Juan RP 2015-12-07 11:19:23 +01:00
commit 0ae592fd4a
2 changed files with 55 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
srcpkgs/valgrind/patches/musl-fixes.patch Normal file
View File

@ -0,0 +1,48 @@
diff -upr valgrind-3.11.0.orig/configure.ac valgrind-3.11.0/configure.ac
--- configure.ac 2015-10-03 02:28:18.597612716 +0200
+++ configure.ac 2015-10-03 02:28:49.284502749 +0200
@@ -1066,8 +1066,6 @@ case "${GLIBC_VERSION}" in
;;
2.0|2.1|*)
AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
- AC_MSG_ERROR([Valgrind requires glibc version 2.2 or later,])
- AC_MSG_ERROR([Darwin libc, Bionic libc or Solaris libc])
;;
esac
diff -upr valgrind-3.11.0.orig/coregrind/vg_preloaded.c valgrind-3.11.0/coregrind/vg_preloaded.c
--- coregrind/vg_preloaded.c 2015-10-03 02:28:18.367636023 +0200
+++ coregrind/vg_preloaded.c 2015-10-03 02:28:37.745672152 +0200
@@ -56,7 +56,7 @@
void VG_NOTIFY_ON_LOAD(freeres)( void );
void VG_NOTIFY_ON_LOAD(freeres)( void )
{
-# if !defined(__UCLIBC__) \
+# if defined(__GLIBC__) \
&& !defined(VGPV_arm_linux_android) \
&& !defined(VGPV_x86_linux_android) \
&& !defined(VGPV_mips32_linux_android) \
diff -upr valgrind-3.11.0.orig/include/pub_tool_redir.h valgrind-3.11.0/include/pub_tool_redir.h
--- include/pub_tool_redir.h 2015-10-03 02:28:18.304309107 +0200
+++ include/pub_tool_redir.h 2015-10-03 02:28:37.745672152 +0200
@@ -242,7 +242,7 @@
/* --- Soname of the standard C library. --- */
#if defined(VGO_linux) || defined(VGO_solaris)
-# define VG_Z_LIBC_SONAME libcZdsoZa // libc.so*
+# define VG_Z_LIBC_SONAME libcZdZa // libc.*
#elif defined(VGO_darwin) && (DARWIN_VERS <= DARWIN_10_6)
# define VG_Z_LIBC_SONAME libSystemZdZaZddylib // libSystem.*.dylib
@@ -274,7 +274,11 @@
/* --- Soname of the pthreads library. --- */
#if defined(VGO_linux)
+# if defined(__GLIBC__) || defined(__UCLIBC__)
# define VG_Z_LIBPTHREAD_SONAME libpthreadZdsoZd0 // libpthread.so.0
+# else
+# define VG_Z_LIBPTHREAD_SONAME libcZdZa // libc.*
+# endif
#elif defined(VGO_darwin)
# define VG_Z_LIBPTHREAD_SONAME libSystemZdZaZddylib // libSystem.*.dylib
#elif defined(VGO_solaris)

10
srcpkgs/valgrind/template
View File

@ -1,11 +1,11 @@
# Template file for 'valgrind'
pkgname=valgrind
version=3.11.0
revision=1
only_for_archs="i686 x86_64 armv7l"
revision=2
only_for_archs="i686 x86_64 armv7l i686-musl x86_64-musl armv7l-musl"
build_style=gnu-configure
configure_args="--enable-tls --with-mpicc=/dev/null"
hostmakedepends="perl pkg-config"
hostmakedepends="automake perl pkg-config"
makedepends="libgomp-devel"
depends="perl"
short_desc="Tool for finding memory management bugs in programs"
@ -24,6 +24,10 @@ if [ "$XBPS_TARGET_MACHINE" = "armv7l" ]; then
configure_args+=" ac_cv_host=armv7l-unknown-linux-gnueabihf"
fi
pre_configure() {
autoreconf -fi
}
valgrind-devel_package() {
depends="valgrind>=${version}_${revision}"
short_desc+=" - development files"