diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /app-admin/rsyslog/files/8-stable/50-rsyslog-add-option-to-disable-valgrind-usage-in-testbench.patch | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.xz |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'app-admin/rsyslog/files/8-stable/50-rsyslog-add-option-to-disable-valgrind-usage-in-testbench.patch')
-rw-r--r-- | app-admin/rsyslog/files/8-stable/50-rsyslog-add-option-to-disable-valgrind-usage-in-testbench.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/app-admin/rsyslog/files/8-stable/50-rsyslog-add-option-to-disable-valgrind-usage-in-testbench.patch b/app-admin/rsyslog/files/8-stable/50-rsyslog-add-option-to-disable-valgrind-usage-in-testbench.patch new file mode 100644 index 00000000000..77d7919c618 --- /dev/null +++ b/app-admin/rsyslog/files/8-stable/50-rsyslog-add-option-to-disable-valgrind-usage-in-testbench.patch @@ -0,0 +1,56 @@ +From 2945539d12bbb79c44fd4402e87150b4ec58af25 Mon Sep 17 00:00:00 2001 +From: Thomas D. +Date: Tue, 24 Mar 2015 02:03:13 +0100 +Subject: [PATCH] Add option to disable valgrind usage in testbench + +Temporary workaround for https://github.com/rsyslog/rsyslog/issues/263 + +--- + configure.ac | 27 +++++++++++++++++++++++---- + 1 file changed, 23 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 0c72f80..cdfdd25 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -13,10 +13,6 @@ AC_CONFIG_HEADERS([config.h]) + + AC_USE_SYSTEM_EXTENSIONS + +-# check if valgrind is present +-AC_CHECK_PROG(have_valgrind, [valgrind], [yes]) +-AM_CONDITIONAL(HAVE_VALGRIND, test x$have_valgrind = xyes) +- + # Checks for programs. + AC_PROG_LEX + AC_PROG_YACC +@@ -1125,6 +1121,29 @@ if test "x$enable_testbench" = "xyes"; then + fi + + ++# valgrind-testbench ++AC_ARG_WITH([valgrind_testbench], ++ [AS_HELP_STRING([--without-valgrind-testbench], [Don't use valgrind in testbench])] ++) ++ ++if test "x$with_valgrind_testbench" != "xno"; then ++ AC_CHECK_PROG(VALGRIND, [valgrind], [valgrind], [no]) ++ ++ if test "x$enable_testbench" = "xyes" && test "x$VALGRIND" = "xno"; then ++ if test "x$with_valgrind_testbench" = "xyes"; then ++ AC_MSG_ERROR([valgrind is missing but forced with --with-valgrind-testbench. Either install valgrind or remove the option!]) ++ else ++ AC_MSG_WARN([valgrind is missing -- testbench won't use valgrind!]) ++ fi ++ else ++ AC_MSG_NOTICE([testbench will use valgrind]) ++ fi ++else ++ AC_MSG_NOTICE([testbench won't use valgrind due to set --without-valgrind-testbench option]) ++fi ++AM_CONDITIONAL([HAVE_VALGRIND], [test "x$with_valgrind_testbench" != "xno" && test "x$VALGRIND" != "xno"]) ++ ++ + # settings for the file input module + AC_ARG_ENABLE(imfile, + [AS_HELP_STRING([--enable-imfile],[file input module enabled @<:@default=no@:>@])], |