Commit 750dbd90 authored by Tom Barbette's avatar Tom Barbette

Merge branch 'master' of https://github.com/kohler/click into fastclick

parents 72ca36f6 8355cc14
Pipeline #557 passed with stage
in 10 minutes and 26 seconds
......@@ -13234,9 +13234,9 @@ $as_echo_n "checking for GNU make... " >&6; }
if ${ac_cv_gnu_make+:} false; then :
$as_echo_n "(cached) " >&6
else
if /bin/sh -c 'make -f /dev/null -n --version | grep GNU' >/dev/null 2>&1; then
if /bin/sh -c 'make -f /dev/null -n --version | grep GNU' >/dev/null 2>/dev/null; then
ac_cv_gnu_make='make'
elif /bin/sh -c 'gmake -f /dev/null -n --version | grep GNU' >/dev/null 2>&1; then
elif /bin/sh -c 'gmake -f /dev/null -n --version | grep GNU' >/dev/null 2>/dev/null; then
ac_cv_gnu_make='gmake'
else
ac_cv_gnu_make='not found'
......@@ -13246,7 +13246,7 @@ fi
$as_echo "$ac_cv_gnu_make" >&6; }
test "$ac_cv_gnu_make" != 'not found' && GMAKE="$ac_cv_gnu_make"
else
/bin/sh -c '$GMAKE -f /dev/null -n --version | grep GNU' >/dev/null 2>&1 || GMAKE=''
/bin/sh -c '$GMAKE -f /dev/null -n --version | grep GNU' >/dev/null 2>/dev/null || GMAKE='1'
fi
SUBMAKE=''
......
......@@ -607,16 +607,16 @@ dnl
AC_DEFUN([CLICK_PROG_GMAKE], [
if test "${GMAKE-NO}" = NO; then
AC_CACHE_CHECK(for GNU make, ac_cv_gnu_make,
[if /bin/sh -c 'make -f /dev/null -n --version | grep GNU' >/dev/null 2>&1; then
[if /bin/sh -c 'make -f /dev/null -n --version | grep GNU' >/dev/null 2>/dev/null; then
ac_cv_gnu_make='make'
elif /bin/sh -c 'gmake -f /dev/null -n --version | grep GNU' >/dev/null 2>&1; then
elif /bin/sh -c 'gmake -f /dev/null -n --version | grep GNU' >/dev/null 2>/dev/null; then
ac_cv_gnu_make='gmake'
else
ac_cv_gnu_make='not found'
fi])
test "$ac_cv_gnu_make" != 'not found' && GMAKE="$ac_cv_gnu_make"
else
/bin/sh -c '$GMAKE -f /dev/null -n --version | grep GNU' >/dev/null 2>&1 || GMAKE=''
/bin/sh -c '$GMAKE -f /dev/null -n --version | grep GNU' >/dev/null 2>/dev/null || GMAKE='1'
fi
SUBMAKE=''
......
......@@ -502,7 +502,7 @@ static bool set_affinity = false;
#if (HAVE_DECL_PTHREAD_SETAFFINITY_NP)
void do_set_affinity(pthread_t p, int cpu) {
if (!dpdk_enabled) {
if (!dpdk_enabled && set_affinity) {
cpu_set_t set;
CPU_ZERO(&set);
CPU_SET(cpu, &set);
......@@ -626,6 +626,7 @@ main(int argc, char **argv)
#if HAVE_DPDK
case DPDK_OPT: {
const char* arg;
dpdk_arg.push_back(argv[0]);
do {
arg = Clp_Shift(clp, 1);
if (arg == NULL) break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment