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/python32/files/patch-Makefile.pre.in | |
| 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/python32/files/patch-Makefile.pre.in')
| -rw-r--r-- | lang/python32/files/patch-Makefile.pre.in | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/lang/python32/files/patch-Makefile.pre.in b/lang/python32/files/patch-Makefile.pre.in index 500fb5a736e8..997211fbf9a8 100644 --- a/lang/python32/files/patch-Makefile.pre.in +++ b/lang/python32/files/patch-Makefile.pre.in @@ -1,5 +1,30 @@ ---- ./Makefile.pre.in.orig 2013-04-06 11:38:41.000000000 +0400 -+++ ./Makefile.pre.in 2013-04-08 17:48:45.000000000 +0400 +--- Makefile.pre.in.orig 2013-05-16 02:33:51.000000000 +1000 ++++ Makefile.pre.in 2013-09-05 23:42:32.910025692 +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@ @@ -277,21 +277,21 @@ ########################################################################## |