mirror of https://github.com/python/cpython
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:
parent
b7a515609d
commit
c6d936e23f
|
@ -463,10 +463,10 @@ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): \
|
|||
-install_name $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK) \
|
||||
-compatibility_version $(VERSION) \
|
||||
-current_version $(VERSION) \
|
||||
-framework CoreFoundation; \
|
||||
-framework CoreFoundation $(LIBS); \
|
||||
else \
|
||||
/usr/bin/libtool -o $(LDLIBRARY) -dynamic $(OTHER_LIBTOOL_OPT) $(LIBRARY) \
|
||||
@LIBTOOL_CRUFT@ -framework CoreFoundation;\
|
||||
@LIBTOOL_CRUFT@ -framework CoreFoundation $(LIBS);\
|
||||
fi
|
||||
$(INSTALL) -d -m $(DIRMODE) \
|
||||
$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Resources/English.lproj
|
||||
|
|
|
@ -58,6 +58,13 @@ C-API
|
|||
--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?
|
||||
=============================================
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#! /bin/sh
|
||||
# From configure.in Revision: 73021 .
|
||||
# From configure.in Revision: 73142 .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.61 for python 3.1.
|
||||
#
|
||||
|
@ -13892,6 +13892,7 @@ cat >>confdefs.h <<\_ACEOF
|
|||
#define WITH_LIBINTL 1
|
||||
_ACEOF
|
||||
|
||||
LIBS="-lintl $LIBS"
|
||||
fi
|
||||
|
||||
|
||||
|
|
|
@ -1819,8 +1819,9 @@ fi
|
|||
|
||||
# check if we need libintl for locale functions
|
||||
AC_CHECK_LIB(intl, textdomain,
|
||||
AC_DEFINE(WITH_LIBINTL, 1,
|
||||
[Define to 1 if libintl is needed for locale functions.]))
|
||||
[AC_DEFINE(WITH_LIBINTL, 1,
|
||||
[Define to 1 if libintl is needed for locale functions.])
|
||||
LIBS="-lintl $LIBS"])
|
||||
|
||||
# checks for system dependent C++ extensions support
|
||||
case "$ac_sys_system" in
|
||||
|
|
Loading…
Reference in New Issue