From 91b726dcf72c79c9647542aa92c20f6c3db07c7e Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Mon, 13 Mar 2017 17:47:17 +0000 Subject: [PATCH] GNU_CONFIGURE: Fix ax_am_jobserver usage to respect MAKE_JOBS_NUMBER. PR: 217670 [exp-run] With hat: portmgr --- Mk/bsd.port.mk | 3 +++ databases/libmemcached/Makefile | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 238dcdee8492..7394a52ecb9e 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -2560,6 +2560,9 @@ SET_LATE_CONFIGURE_ARGS= \ if [ ! -z "`${CONFIGURE_CMD} --help 2>&1 | ${GREP} -- '--disable-silent-rules'`" ]; then \ _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --disable-silent-rules" ; \ fi ; \ + if [ ! -z "`${CONFIGURE_CMD} --help 2>&1 | ${GREP} -- '--enable-jobserver\[.*\#\]'`" ]; then \ + _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --enable-jobserver=${MAKE_JOBS_NUMBER}" ; \ + fi ; \ if [ ! -z "`${CONFIGURE_CMD} --help 2>&1 | ${GREP} -- '--infodir'`" ]; then \ _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --infodir=${GNU_CONFIGURE_PREFIX}/${INFO_PATH}/${INFO_SUBDIR}" ; \ fi ; \ diff --git a/databases/libmemcached/Makefile b/databases/libmemcached/Makefile index e23851a5545c..6dd6128ade7d 100644 --- a/databases/libmemcached/Makefile +++ b/databases/libmemcached/Makefile @@ -21,7 +21,6 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-memcached \ --without-sphinx-build \ - --enable-jobserver=${MAKE_JOBS_NUMBER} \ --enable-libmemcachedprotocol LIBS+= -L${LOCALBASE}/lib -lexecinfo