diff options
Diffstat (limited to 'meta-networking/recipes-connectivity/samba/samba/21-add-config-option-without-valgrind.patch')
| -rw-r--r-- | meta-networking/recipes-connectivity/samba/samba/21-add-config-option-without-valgrind.patch | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/meta-networking/recipes-connectivity/samba/samba/21-add-config-option-without-valgrind.patch b/meta-networking/recipes-connectivity/samba/samba/21-add-config-option-without-valgrind.patch index 025ac2775f..6a7f8facc5 100644 --- a/meta-networking/recipes-connectivity/samba/samba/21-add-config-option-without-valgrind.patch +++ b/meta-networking/recipes-connectivity/samba/samba/21-add-config-option-without-valgrind.patch @@ -6,6 +6,7 @@ Subject: [PATCH] Add config option without-valgrind Upstream-Status: Pending Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> + --- lib/replace/wscript | 4 +++- source3/wscript | 5 ++++- @@ -16,9 +17,9 @@ diff --git a/lib/replace/wscript b/lib/replace/wscript index f0040b1..aca73af 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript -@@ -101,7 +101,9 @@ struct foo bar = { .y = 'X', .x = 1 }; - - conf.CHECK_CODE('', headers='rpc/rpc.h rpcsvc/yp_prot.h', define='HAVE_RPCSVC_YP_PROT_H') +@@ -101,7 +101,9 @@ def configure(conf): + conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h') + conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h') - conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h') + if not Options.options.disable_valgrind: @@ -26,12 +27,12 @@ index f0040b1..aca73af 100644 + conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') - conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h malloc.h') + conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') diff --git a/source3/wscript b/source3/wscript index bac3dd5..a5c51ea 100644 --- a/source3/wscript +++ b/source3/wscript -@@ -1016,7 +1016,10 @@ syscall(SYS_setgroups32, 0, NULL); +@@ -1070,7 +1070,10 @@ syscall(SYS_setgroups32, 0, NULL); Logs.warn("--with-dnsupdate=yes but gssapi support not sufficient") else: conf.DEFINE('WITH_DNS_UPDATES', 1) @@ -44,12 +45,12 @@ index bac3dd5..a5c51ea 100644 if conf.CONFIG_SET('HAVE_VALGRIND_H') or conf.CONFIG_SET('HAVE_VALGRIND_VALGRIND_H'): conf.DEFINE('VALGRIND', '1') diff --git a/wscript b/wscript -index 7679c0f..681ac17 100644 +index 542a60c..22e6116 100644 --- a/wscript +++ b/wscript -@@ -72,6 +72,10 @@ def set_options(opt): - help=("Disable systemd integration"), - action='store_false', dest='enable_systemd') +@@ -86,6 +86,10 @@ def set_options(opt): + help=("Disable RELRO builds"), + action="store_false", dest='enable_relro') + opt.add_option('--without-valgrind', + help=("Disable use of the valgrind headers"), |