Date: Sun, 24 Nov 2013 14:03:44 +0000 (UTC) From: Kubilay Kocak <koobs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334727 - in head/lang/python26: . files Message-ID: <201311241403.rAOE3i5H020708@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: koobs Date: Sun Nov 24 14:03:44 2013 New Revision: 334727 URL: http://svnweb.freebsd.org/changeset/ports/334727 Log: lang/python26: Fix CFLAGS in python-config where cc = clang - Temporarily override OPT:Olimit using CONFIGURE_ENV (ports/182952) [1] - Replace patch: extra-patch-configure-pth with CONFIGURE_ENV instead - QA: Clean up and group related USE_*, WRKSRC and CONFIGURE entries - QA: Whitespace alignment - QA: Clarify DEPRECATED message [1] Python removed OPT:Olimit in 3.2+, requested backport or alternative upstream patch: http://bugs.python.org/issue877121 PR: ports/182952 Submitted by: pawel Reviewed by: antoine Deleted: head/lang/python26/files/extra-patch-configure-pth Modified: head/lang/python26/Makefile Modified: head/lang/python26/Makefile ============================================================================== --- head/lang/python26/Makefile Sun Nov 24 13:47:48 2013 (r334726) +++ head/lang/python26/Makefile Sun Nov 24 14:03:44 2013 (r334727) @@ -3,6 +3,7 @@ PORTNAME= python26 PORTVERSION= 2.6.9 +PORTREVISION= 1 CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -11,26 +12,28 @@ DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= python@FreeBSD.org COMMENT= Interpreted object-oriented programming language -DEPRECATED= This port reached its EoL upstream, please migrate to lang/python27 +DEPRECATED= Python 2.6 is now end-of-life, please migrate to lang/python27 EXPIRATION_DATE=2014-01-01 DIST_SUBDIR= python -WRKSRC= ${PYTHON_WRKSRC}/portbld.static -PATCH_WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes CONFIGURE_SCRIPT= ../configure # must be relative -CONFIGURE_ENV= SVNVERSION="echo freebsd" +CONFIGURE_ENV= SVNVERSION="echo freebsd" ac_cv_opt_olimit_ok=no MAKE_ENV= VPATH="${PYTHON_WRKSRC}" -USE_LDCONFIG= yes INSTALL_TARGET= altinstall MAN1= ${PYTHON_VERSION}.1 +USE_LDCONFIG= yes USE_PYTHON= yes USE_XZ= yes -PYTHON_VERSION= python2.6 + +PYTHON_VERSION= python2.6 PYTHON_NO_DEPENDS= yes +WRKSRC= ${PYTHON_WRKSRC}/portbld.static SHARED_WRKSRC= ${PYTHON_WRKSRC}/portbld.shared +PATCH_WRKSRC= ${PYTHON_WRKSRC} + PLIST= ${WRKDIR}/PLIST PLIST_TEMPLATE?=${PKGDIR}/pkg-plist PLIST_SUB= PYVER=${PYTHON_VERSION:S/python//} \ @@ -53,7 +56,7 @@ BINLINKS_SUB_PYTHON_VER= ${BINLINKS_SUB_ OPTIONS_DEFINE= THREADS SEM PTH PYMALLOC IPV6 FPECTL EXAMPLES NLS OPTIONS_DEFAULT= THREADS UCS4 PYMALLOC IPV6 -OPTIONS_SINGLE= UCS +OPTIONS_SINGLE= UCS OPTIONS_SINGLE_UCS= UCS2 UCS4 NLS_DESC= Enable Gettext support for the locale module @@ -92,7 +95,7 @@ SUB_LIST= SEM=${SEM_MSG} PLIST_SUB+= THREADS="" .if ${PORT_OPTIONS:MPTH} CONFIGURE_ARGS+= --with-pth -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-configure-pth +CONFIGURE_ENV+= ac_cv_pthread=no LIB_DEPENDS+= pth:${PORTSDIR}/devel/pth _PTH_CPPFLAGS= "-I${LOCALBASE}/include/pth" _PTH_LDFLAGS= "-L${LOCALBASE}/lib/pth"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311241403.rAOE3i5H020708>