From 38f4ec86d56361c295286c697514bbfba73efac3 Mon Sep 17 00:00:00 2001 From: Sergei Kolobov Date: Thu, 20 Nov 2003 16:11:52 +0000 Subject: [PATCH] - Fix build (previous update was incomplete): Do not add PYTHON_* variables to MAKE_ENV unless WITH_PYTHON knob is enabled - Remove spaces on empty line to please portlint While I'm here: - s/+=/=/ where appropriate PR: 59255 Submitted by: Sergey Matveychuk Approved by: maintainer's silence --- devel/boost/Makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/devel/boost/Makefile b/devel/boost/Makefile index ecdd44aecbf5..061ec534fe29 100644 --- a/devel/boost/Makefile +++ b/devel/boost/Makefile @@ -17,24 +17,22 @@ DISTNAME= ${PORTNAME}-${PORTVERSION} MAINTAINER= pmarquis@pobox.com COMMENT= Free peer-reviewed portable C++ source libraries -MAKE_ENV+= BOOST_ROOT=${WRKSRC} BUILD="debug release" +MAKE_ENV= BOOST_ROOT=${WRKSRC} BUILD="debug release" .if defined(WITH_PYTHON) USE_PYTHON= yes # 1.30.2 doesn't support python2.3 PYTHON_VERSION= python2.2 -COMPILED_LIBS+= python -PLIST_SUB+= BOOST_PYTHON="" +COMPILED_LIBS= python +PLIST_SUB= BOOST_PYTHON="" +MAKE_ENV+= PYTHON_ROOT="${PREFIX}" \ + PYTHON_VERSION="${_PYTHON_VERSION}" \ + PYTHON_INCLUDES="${PYTHON_INCLUDEDIR}" \ + PYTHON_LIB_PATH="${PYTHON_LIBDIR}" .else -PLIST_SUB+= BOOST_PYTHON="@comment " +PLIST_SUB= BOOST_PYTHON="@comment " .endif -.include - -MAKE_ENV+= PYTHON_ROOT="${PREFIX}" -MAKE_ENV+= PYTHON_VERSION="${_PYTHON_VERSION}" -MAKE_ENV+= PYTHON_INCLUDES="${PYTHON_INCLUDEDIR}" -MAKE_ENV+= PYTHON_LIB_PATH="${PYTHON_LIBDIR}" INSTALLS_SHLIB= yes DOCFILES= *.css *.gif *.htm *.html *.jpeg *.jpg *.png @@ -42,6 +40,8 @@ BJAM= ${WRKSRC}/tools/build/jam_src/bin.freebsd/bjam COMPILED_LIBS+= date_time filesystem regex signals test thread +.include + do-configure: # for -pthread options .if ${OSVERSION} >= 500016