Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

When _locale became a built-in module it was discovered that ``-lintl`` was not 

added as a build flag as needed. This then led to the discovery that OS X
framework builds did not have the LIBS var to pick up this flag.

Fixes issue #6154. Thanks to Benjamin Peterson, Roumen Petrov, Erick Tryzelaar,
Mark Dickinson, Evan Behar, and Ronald Oussoren for helping.
This commit is contained in:
Brett Cannon 2009-06-07 20:09:53 +00:00
parent b7a515609d
commit c6d936e23f
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.pre.in
View File

@ -463,10 +463,10 @@ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): \
-install_name $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK) \ -install_name $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK) \
-compatibility_version $(VERSION) \ -compatibility_version $(VERSION) \
-current_version $(VERSION) \ -current_version $(VERSION) \
-framework CoreFoundation; \ -framework CoreFoundation $(LIBS); \
else \ else \
/usr/bin/libtool -o $(LDLIBRARY) -dynamic $(OTHER_LIBTOOL_OPT) $(LIBRARY) \ /usr/bin/libtool -o $(LDLIBRARY) -dynamic $(OTHER_LIBTOOL_OPT) $(LIBRARY) \
@LIBTOOL_CRUFT@ -framework CoreFoundation;\ @LIBTOOL_CRUFT@ -framework CoreFoundation $(LIBS);\
fi fi
$(INSTALL) -d -m $(DIRMODE) \ $(INSTALL) -d -m $(DIRMODE) \
$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Resources/English.lproj $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Resources/English.lproj

7
Misc/NEWS
View File

@ -58,6 +58,13 @@ C-API
--with-pydebug, and vice-versa. --with-pydebug, and vice-versa.
Build
-----
- Issue #6154: Make sure the intl library is added to LIBS if needed. Also
added LIBS to OS X framework builds.
What's New in Python 3.1 release candidate 1? What's New in Python 3.1 release candidate 1?
============================================= =============================================

3
configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Revision: 73021 . # From configure.in Revision: 73142 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for python 3.1. # Generated by GNU Autoconf 2.61 for python 3.1.
# #
@ -13892,6 +13892,7 @@ cat >>confdefs.h <<\_ACEOF
#define WITH_LIBINTL 1 #define WITH_LIBINTL 1
_ACEOF _ACEOF
LIBS="-lintl $LIBS"
fi fi

5
configure.in
View File

@ -1819,8 +1819,9 @@ fi
# check if we need libintl for locale functions # check if we need libintl for locale functions
AC_CHECK_LIB(intl, textdomain, AC_CHECK_LIB(intl, textdomain,
AC_DEFINE(WITH_LIBINTL, 1, [AC_DEFINE(WITH_LIBINTL, 1,
[Define to 1 if libintl is needed for locale functions.])) [Define to 1 if libintl is needed for locale functions.])
LIBS="-lintl $LIBS"])
# checks for system dependent C++ extensions support # checks for system dependent C++ extensions support
case "$ac_sys_system" in case "$ac_sys_system" in