From 3c88d24249d67e3e6b43d56b7052a155bd0150e0 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Thu, 21 Apr 2022 12:24:10 +0200 Subject: [PATCH] package/valgrind: fix compilation for uclibc - Add upstream patch ([1]) to fix compilation for uclibc - Add autoreconf as the patch touches configure.ac [1] https://sourceware.org/git/?p=valgrind.git;a=commit;h=9c9fd9ae24b45f915f0759d32f662835c26d37c3 Signed-off-by: Dario Binacchi Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...coregrind-fix-compilation-for-uclibc.patch | 65 +++++++++++++++++++ package/valgrind/valgrind.mk | 2 + 2 files changed, 67 insertions(+) create mode 100644 package/valgrind/0003-coregrind-fix-compilation-for-uclibc.patch diff --git a/package/valgrind/0003-coregrind-fix-compilation-for-uclibc.patch b/package/valgrind/0003-coregrind-fix-compilation-for-uclibc.patch new file mode 100644 index 0000000000..ff8dc974d8 --- /dev/null +++ b/package/valgrind/0003-coregrind-fix-compilation-for-uclibc.patch @@ -0,0 +1,65 @@ +From 9c9fd9ae24b45f915f0759d32f662835c26d37c3 Mon Sep 17 00:00:00 2001 +From: Dario Binacchi +Date: Fri, 8 Apr 2022 12:36:33 +0200 +Subject: [PATCH] coregrind: fix compilation for uclibc + +It fixes a known iusse whose details are described at [1] and more +generally it guarantees that Valgrind is properly compiled for ulibc. + +[1] https://www.mail-archive.com/valgrind-users@lists.sourceforge.net/msg05295.html + +Suggested-by Michael Trimarchi +Co-developed-by: Michael Trimarchi +Signed-off-by: Dario Binacchi +--- + configure.ac | 2 ++ + coregrind/m_debuginfo/minilzo-inl.c | 4 ++++ + coregrind/vg_preloaded.c | 4 ++++ + 3 files changed, 10 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 6f51dfd9f8fb..c627a9c17a4a 100755 +--- a/configure.ac ++++ b/configure.ac +@@ -1204,6 +1204,8 @@ AC_SUBST(DEFAULT_SUPP) + AC_CHECK_HEADER([features.h]) + + if test x$ac_cv_header_features_h = xyes; then ++ AC_DEFINE([HAVE_HEADER_FEATURES_H], 1, ++ [Define to 1 if you have the `features.h' header.]) + rm -f conftest.$ac_ext + cat <<_ACEOF >conftest.$ac_ext + #include +diff --git a/coregrind/m_debuginfo/minilzo-inl.c b/coregrind/m_debuginfo/minilzo-inl.c +index 153d008fd44f..b45ec92eaa85 100644 +--- a/coregrind/m_debuginfo/minilzo-inl.c ++++ b/coregrind/m_debuginfo/minilzo-inl.c +@@ -1875,6 +1875,10 @@ extern "C" { + + #endif + ++#ifdef HAVE_HEADER_FEATURES_H ++#include ++#endif ++ + #undef LZO_HAVE_CONFIG_H + #include "minilzo.h" + +diff --git a/coregrind/vg_preloaded.c b/coregrind/vg_preloaded.c +index 5e2098390847..3809811aede7 100644 +--- a/coregrind/vg_preloaded.c ++++ b/coregrind/vg_preloaded.c +@@ -45,6 +45,10 @@ + #include "pub_core_debuginfo.h" // Needed for pub_core_redir.h + #include "pub_core_redir.h" // For VG_NOTIFY_ON_LOAD + ++#ifdef HAVE_HEADER_FEATURES_H ++#include ++#endif ++ + #if defined(VGO_linux) || defined(VGO_solaris) || defined(VGO_freebsd) + + /* --------------------------------------------------------------------- +-- +2.32.0 + diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk index 52f2a04ffa..a3eabec9fe 100644 --- a/package/valgrind/valgrind.mk +++ b/package/valgrind/valgrind.mk @@ -14,6 +14,8 @@ VALGRIND_CONF_OPTS = \ --disable-ubsan \ --without-mpicc VALGRIND_INSTALL_STAGING = YES +# 0003-coregrind-fix-compilation-for-uclibc.patch +VALGRIND_AUTORECONF=YES # Valgrind must be compiled with no stack protection, so forcefully # pass -fno-stack-protector to override what Buildroot may have in