aboutsummaryrefslogtreecommitdiffstats
path: root/lang/python33
diff options
context:
space:
mode:
authorkoobs <koobs@FreeBSD.org>2013-09-08 22:05:18 +0800
committerkoobs <koobs@FreeBSD.org>2013-09-08 22:05:18 +0800
commit3835cd8c9b3bdc5ee612ea55989ddbabfe1fef61 (patch)
tree6d7fe992f675eda5ec64a27474e0fe9678c0334d /lang/python33
parente0446068231b513e183e383ab20bfa34e009f152 (diff)
downloadfreebsd-ports-gnome-3835cd8c9b3bdc5ee612ea55989ddbabfe1fef61.tar.gz
freebsd-ports-gnome-3835cd8c9b3bdc5ee612ea55989ddbabfe1fef61.tar.zst
freebsd-ports-gnome-3835cd8c9b3bdc5ee612ea55989ddbabfe1fef61.zip
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
Diffstat (limited to 'lang/python33')
-rw-r--r--lang/python33/Makefile12
-rw-r--r--lang/python33/files/patch-Makefile.pre.in29
2 files changed, 34 insertions, 7 deletions
diff --git a/lang/python33/Makefile b/lang/python33/Makefile
index d8d7269a00d3..ecd09204d473 100644
--- a/lang/python33/Makefile
+++ b/lang/python33/Makefile
@@ -2,7 +2,7 @@
PORTNAME= python33
PORTVERSION= 3.3.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= lang python ipv6
MASTER_SITES= PYTHON
MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR}
@@ -16,7 +16,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= OPT="" SVNVERSION="echo freebsd"
MAKE_ENV= VPATH="${PYTHON_WRKSRC}"
USE_LDCONFIG= yes
INSTALL_TARGET= altinstall
@@ -57,9 +57,11 @@ 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
.else
CONFIGURE_ENV+= ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no
.endif
diff --git a/lang/python33/files/patch-Makefile.pre.in b/lang/python33/files/patch-Makefile.pre.in
index 2e7654bbb0ab..6f49f6e25e59 100644
--- a/lang/python33/files/patch-Makefile.pre.in
+++ b/lang/python33/files/patch-Makefile.pre.in
@@ -1,5 +1,30 @@
---- ./Makefile.pre.in.orig 2013-04-06 11:41:48.000000000 +0400
-+++ ./Makefile.pre.in 2013-04-08 16:16:25.000000000 +0400
+--- Makefile.pre.in.orig 2013-05-16 02:32:57.000000000 +1000
++++ Makefile.pre.in 2013-09-05 23:48:22.439871947 +1000
+@@ -70,18 +70,18 @@
+ OPT= @OPT@
+ BASECFLAGS= @BASECFLAGS@
+ BASECPPFLAGS= @BASECPPFLAGS@
+-CONFIGURE_CFLAGS= @CFLAGS@
+-CONFIGURE_CPPFLAGS= @CPPFLAGS@
+-CONFIGURE_LDFLAGS= @LDFLAGS@
++CFLAGS= @CFLAGS@
++CPPFLAGS= @CPPFLAGS@
++LDFLAGS= @LDFLAGS@
+ # Avoid assigning CFLAGS, LDFLAGS, etc. so users can use them on the
+ # command line to append to these values without stomping the pre-set
+ # values.
+-PY_CFLAGS= $(BASECFLAGS) $(OPT) $(CONFIGURE_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
++PY_CFLAGS= $(BASECFLAGS) $(OPT) $(CFLAGS) $(EXTRA_CFLAGS)
+ # Both CPPFLAGS and LDFLAGS need to contain the shell's value for setup.py to
+ # be able to build extension modules using the directories specified in the
+ # environment variables
+-PY_CPPFLAGS= $(BASECPPFLAGS) -I. -IInclude -I$(srcdir)/Include $(CONFIGURE_CPPFLAGS) $(CPPFLAGS)
+-PY_LDFLAGS= $(CONFIGURE_LDFLAGS) $(LDFLAGS)
++PY_CPPFLAGS= $(BASECPPFLAGS) -I. -IInclude -I$(srcdir)/Include $(CPPFLAGS)
++PY_LDFLAGS= $(LDFLAGS)
+ NO_AS_NEEDED= @NO_AS_NEEDED@
+ LDLAST= @LDLAST@
+ SGI_ABI= @SGI_ABI@
@@ -306,21 +306,21 @@
##########################################################################