From owner-svn-ports-head@freebsd.org Fri Mar 2 06:31:48 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2C62CF28667; Fri, 2 Mar 2018 06:31:48 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D2FFC6F8EE; Fri, 2 Mar 2018 06:31:47 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CDF0113E72; Fri, 2 Mar 2018 06:31:47 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w226Vlbj082203; Fri, 2 Mar 2018 06:31:47 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w226Vl0q082202; Fri, 2 Mar 2018 06:31:47 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201803020631.w226Vl0q082202@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Fri, 2 Mar 2018 06:31:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r463373 - head/lang/python27 X-SVN-Group: ports-head X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: head/lang/python27 X-SVN-Commit-Revision: 463373 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 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: Fri, 02 Mar 2018 06:31:48 -0000 Author: antoine Date: Fri Mar 2 06:31:47 2018 New Revision: 463373 URL: https://svnweb.freebsd.org/changeset/ports/463373 Log: Revert r463321, it breaks lang/python27 on at least vanilla FreeBSD 10.x Reported by: pkg-fallout With hat: portmgr Modified: head/lang/python27/Makefile Modified: head/lang/python27/Makefile ============================================================================== --- head/lang/python27/Makefile Fri Mar 2 06:20:55 2018 (r463372) +++ head/lang/python27/Makefile Fri Mar 2 06:31:47 2018 (r463373) @@ -14,21 +14,12 @@ COMMENT= Interpreted object-oriented programming langu LICENSE= PSFL -# lang/python* ports use CPPFLAGS over CFLAGS due to multiple complex -# *FLAGS and include ordering bugs/issues in the Python build, that cause -# modules such as elementtree and pyexpat to fail to build, among other -# difficult to isolate issues. Do not add to or modify global variables -# unless the implications and pitfalls are completely understood. -# See: https://bugs.python.org/issue6299#msg210189 - USES= cpe ncurses pathfix pkgconfig readline:port shebangfix ssl tar:xz PATHFIX_MAKEFILEIN= Makefile.pre.in USE_LDCONFIG= yes +CFLAGS+= -I${OPENSSLINC} GNU_CONFIGURE= yes - -CPPFLAGS+= -I${OPENSSLINC} -LDFLAGS+= -L${OPENSSLLIB} - +LIBS+= -L${OPENSSLLIB} python_CMD= ${PREFIX}/bin/python${PYTHON_PORTVERSION:R} SHEBANG_FILES= Lib/lib2to3/pgen2/*.py Lib/lib2to3/tests/*.py Lib/lib2to3/tests/data/*.py \ Lib/idlelib/*.py Lib/encodings/*.py Lib/test/*.py Lib/UserString.py \ @@ -69,6 +60,9 @@ IPV6_CONFIGURE_ENABLE= ipv6 LIBFFI_CONFIGURE_ON= --with-system-ffi LIBFFI_LIB_DEPENDS= libffi.so:devel/libffi +# Use CPPFLAGS over CFLAGS due to -I ordering, causing elementtree and pyexpat +# to break in Python 2.7, or preprocessor complaints in Python >= 3.3 +# Upstream Issue: https://bugs.python.org/issue6299 NLS_USES= gettext NLS_CPPFLAGS= -I${LOCALBASE}/include NLS_LIBS= -L${LOCALBASE}/lib -lintl