From owner-svn-ports-head@FreeBSD.ORG Sun Jul 22 09:45:25 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 905DB1065670; Sun, 22 Jul 2012 09:45:25 +0000 (UTC) (envelope-from mva@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7A7348FC15; Sun, 22 Jul 2012 09:45:25 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6M9jPIG065362; Sun, 22 Jul 2012 09:45:25 GMT (envelope-from mva@svn.freebsd.org) Received: (from mva@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6M9jPDv065359; Sun, 22 Jul 2012 09:45:25 GMT (envelope-from mva@svn.freebsd.org) Message-Id: <201207220945.q6M9jPDv065359@svn.freebsd.org> From: Marcus von Appen Date: Sun, 22 Jul 2012 09:45:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r301311 - in head/lang: python26 python27 X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Jul 2012 09:45:25 -0000 Author: mva Date: Sun Jul 22 09:45:24 2012 New Revision: 301311 URL: http://svn.freebsd.org/changeset/ports/301311 Log: - Fix Python OPT flags for WITH_PTH knob PR: ports/168767 Submitted by: Marcus von Appen Modified: head/lang/python26/Makefile (contents, props changed) head/lang/python27/Makefile (contents, props changed) Modified: head/lang/python26/Makefile ============================================================================== --- head/lang/python26/Makefile Sun Jul 22 09:25:07 2012 (r301310) +++ head/lang/python26/Makefile Sun Jul 22 09:45:24 2012 (r301311) @@ -7,7 +7,7 @@ PORTNAME= python26 PORTVERSION= 2.6.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -21,7 +21,7 @@ WRKSRC= ${PYTHON_WRKSRC}/portbld.static PATCH_WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes CONFIGURE_SCRIPT= ../configure # must be relative -CONFIGURE_ENV= OPT="${CFLAGS}" SVNVERSION="echo freebsd" +CONFIGURE_ENV= SVNVERSION="echo freebsd" MAKE_ENV= VPATH="${PYTHON_WRKSRC}" USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes @@ -148,6 +148,8 @@ CONFIGURE_ARGS+= --disable-ipv6 CONFIGURE_ARGS+= --with-fpectl .endif +CONFIGURE_ENV+= OPT="${CFLAGS} ${_PTH_CPPFLAGS}" + pre-patch: ${CP} -r ${PATCH_WRKSRC}/Lib/plat-freebsd8 \ ${PATCH_WRKSRC}/Lib/plat-freebsd9 @@ -176,8 +178,10 @@ pre-patch: ${PATCH_WRKSRC}/Makefile.pre.in ${SED} -e 's|^#!.*|#!${PREFIX}/bin/${PYTHON_VERSION}|' \ + -e 's|libs = getvar|libs = getvar("LDFLAGS").split() + getvar|' \ ${PATCH_WRKSRC}/Misc/python-config.in > ${WRKDIR}/${PYTHON_VERSION}-config ${SED} -e 's|^#!.*|#!${PREFIX}/bin/${PYTHON_VERSION:S/thon/thon-shared/}|' \ + -e 's|libs = getvar|libs = getvar("LDFLAGS").split() + getvar|' \ ${PATCH_WRKSRC}/Misc/python-config.in > ${WRKDIR}/${PYTHON_VERSION:S/thon/thon-shared/}-config .if ${PORT_OPTIONS:MFPECTL) && ${ARCH} == i386 Modified: head/lang/python27/Makefile ============================================================================== --- head/lang/python27/Makefile Sun Jul 22 09:25:07 2012 (r301310) +++ head/lang/python27/Makefile Sun Jul 22 09:45:24 2012 (r301311) @@ -7,7 +7,7 @@ PORTNAME= python27 PORTVERSION= 2.7.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -21,7 +21,7 @@ WRKSRC= ${PYTHON_WRKSRC}/portbld.static PATCH_WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes CONFIGURE_SCRIPT= ../configure # must be relative -CONFIGURE_ENV= OPT="${CFLAGS}" SVNVERSION="echo freebsd" +CONFIGURE_ENV= SVNVERSION="echo freebsd" MAKE_ENV= VPATH="${PYTHON_WRKSRC}" USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes @@ -157,6 +157,9 @@ CONFIGURE_ARGS+= --disable-ipv6 CONFIGURE_ARGS+= --with-fpectl .endif + +CONFIGURE_ENV+= OPT="${CFLAGS} ${_PTH_CPPFLAGS}" + post-extract: # The distribution tarball for python 2.7 has permission bits for 'others' # set to 0. Later during install, we copy Tools and Demo to the installed @@ -191,8 +194,10 @@ pre-patch: ${PATCH_WRKSRC}/Makefile.pre.in ${SED} -e 's|^#!.*|#!${PREFIX}/bin/${PYTHON_VERSION}|' \ + -e 's|libs = getvar|libs = getvar("LDFLAGS").split() + getvar|' \ ${PATCH_WRKSRC}/Misc/python-config.in > ${WRKDIR}/${PYTHON_VERSION}-config ${SED} -e 's|^#!.*|#!${PREFIX}/bin/${PYTHON_VERSION:S/thon/thon-shared/}|' \ + -e 's|libs = getvar|libs = getvar("LDFLAGS").split() + getvar|' \ ${PATCH_WRKSRC}/Misc/python-config.in > ${WRKDIR}/${PYTHON_VERSION:S/thon/thon-shared/}-config .if ${PORT_OPTIONS:MFPECTL) && ${ARCH} == i386