diff options
author | Kubilay Kocak <koobs@FreeBSD.org> | 2013-09-08 14:05:18 +0000 |
---|---|---|
committer | Kubilay Kocak <koobs@FreeBSD.org> | 2013-09-08 14:05:18 +0000 |
commit | ec7259ec32019cae99f130a03185186ec12aced7 (patch) | |
tree | 6d7fe992f675eda5ec64a27474e0fe9678c0334d /lang/python26 | |
parent | - convert to the new perl5 framework (diff) |
Resolve gettext (libintl) detection and linking in all Python ports
Fix gettext (NLS) detection, includes and linking:
- all: Use LDFLAGS and CPPFLAGS over CFLAGS for NLS option (with comment)
- python26,27: Pass LIBS="-lintl" to CONFIGURE_ENV
Workaround Pythons odd build mechanics causing duplicate args:
- all: Remove CFLAGS from OPT= in CONFIGURE_ENV
- python32,33: Remove CONFIGURE_* variables from Makefile.pre.in
Other:
- python32: Patch setup.py to pass OPT correctly to shared modules
PR: ports/181721
Reported by: pawel
Reviewed by: bapt mva sbz
Notes
Notes:
svn path=/head/; revision=326729
Diffstat (limited to 'lang/python26')
-rw-r--r-- | lang/python26/Makefile | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lang/python26/Makefile b/lang/python26/Makefile index 24ff81cb93d2..0db58929d7ea 100644 --- a/lang/python26/Makefile +++ b/lang/python26/Makefile @@ -3,7 +3,7 @@ PORTNAME= python26 PORTVERSION= 2.6.8 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -63,9 +63,12 @@ NLS_DESC= Enable Gettext support for the locale module .if ${PORT_OPTIONS:MNLS} USES+= gettext -# XXX do not set any LDFLAGS or CFLAGS - this causes pyexpat to fail building -#LDFLAGS+= "-L${LOCALBASE}/lib" -#CFLAGS+= "-I${LOCALBASE}/include" +LDFLAGS+= -L${LOCALBASE}/lib +# We use CPPFLAGS over CFLAGS here due to -I ordering causing things like +# elementtree and pyexpat to break with python27, or to silence preprocessor +# complaints with python33 +CPPFLAGS+= -I${LOCALBASE}/include +CONFIGURE_ENV+= LIBS="-lintl" .else CONFIGURE_ENV+= ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no .endif @@ -144,7 +147,7 @@ CONFIGURE_ARGS+= --disable-ipv6 CONFIGURE_ARGS+= --with-fpectl .endif -CONFIGURE_ENV+= OPT="${CFLAGS} ${_PTH_CPPFLAGS}" +CONFIGURE_ENV+= OPT="${_PTH_CPPFLAGS}" pre-patch: ${CP} -r ${PATCH_WRKSRC}/Lib/plat-freebsd8 \ |