From 9ad835b1a386b20dcad037c4e78e81a9fcd32181 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Wed, 12 Nov 2014 18:36:23 +0800 Subject: systemd: add option for valgrind header checking Add option so that valgrind header checking is controlled. Otherwise, we would get the following error. src/libsystemd/sd-bus/bus-control.c: fatal error: valgrind/mencheck.h: No such file or directory The above error could be reproduced by the following command. bitbake valgrind && bitbake systemd -ccleansstate && bitbake systemd -cconfigure && bitbake valgrind -ccleansstate && bitbake systemd -ccompile Signed-off-by: Chen Qi --- ...re.ac-add-valgrind-header-checking-option.patch | 28 ++++++++++++++++++++++ meta/recipes-core/systemd/systemd_216.bb | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 meta/recipes-core/systemd/systemd/0001-configure.ac-add-valgrind-header-checking-option.patch diff --git a/meta/recipes-core/systemd/systemd/0001-configure.ac-add-valgrind-header-checking-option.patch b/meta/recipes-core/systemd/systemd/0001-configure.ac-add-valgrind-header-checking-option.patch new file mode 100644 index 0000000000..89f334842f --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0001-configure.ac-add-valgrind-header-checking-option.patch @@ -0,0 +1,28 @@ +Upstream-Status: Pending + +Subject: configure.ac: add valgrind header checking option + +Signed-off-by: Chen qi +--- + configure.ac | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 945adfc..dd4d7b2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1141,7 +1141,10 @@ AC_DEFINE_UNQUOTED(TELINIT, ["$TELINIT"], [Path to telinit]) + + AC_SUBST(TELINIT) + +-AC_CHECK_HEADERS_ONCE([valgrind/memcheck.h valgrind/valgrind.h]) ++AC_ARG_ENABLE(valgrindheader, AS_HELP_STRING([--disable-valgrindheader], [disable valgrind header checking])) ++if test "x$enable_valgrindheader" != "xno"; then ++ AC_CHECK_HEADERS_ONCE([valgrind/memcheck.h valgrind/valgrind.h]) ++fi + + # ------------------------------------------------------------------------------ + have_myhostname=no +-- +1.9.1 + diff --git a/meta/recipes-core/systemd/systemd_216.bb b/meta/recipes-core/systemd/systemd_216.bb index 27a5d926ff..b48bc3a5d3 100644 --- a/meta/recipes-core/systemd/systemd_216.bb +++ b/meta/recipes-core/systemd/systemd_216.bb @@ -38,6 +38,7 @@ SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;branch=master;protocol= file://init \ file://run-ptest \ ${@bb.utils.contains('PACKAGECONFIG', 'resolved', '', 'file://0001-tmpfiles.d-etc.conf-disable-resolv.conf-symlink.patch', d)} \ + file://0001-configure.ac-add-valgrind-header-checking-option.patch \ " S = "${WORKDIR}/git" @@ -64,6 +65,7 @@ PACKAGECONFIG[elfutils] = "--enable-elfutils,--disable-elfutils,elfutils" PACKAGECONFIG[resolved] = "--enable-resolved,--disable-resolved" PACKAGECONFIG[networkd] = "--enable-networkd,--disable-networkd" PACKAGECONFIG[libidn] = "--enable-libidn,--disable-libidn,libidn" +PACKAGECONFIG[valgrindheader] = "--enable-valgrindheader,--disable-valgrindheader,valgrind" CACHED_CONFIGUREVARS = "ac_cv_path_KILL=${base_bindir}/kill" -- cgit 1.2.3-korg