summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-05-23 16:34:23 (GMT)
committerBenjamin Peterson <benjamin@python.org>2009-05-23 16:34:23 (GMT)
commit9c80cacb8cede5830447e7bff4e03a35293fa148 (patch)
treef43032f40f40b53afafe2b85462db879fa2a5c8c
parent932073a1695454708fee8acba2fec2a6802d5421 (diff)
downloadcpython-9c80cacb8cede5830447e7bff4e03a35293fa148.zip
cpython-9c80cacb8cede5830447e7bff4e03a35293fa148.tar.gz
cpython-9c80cacb8cede5830447e7bff4e03a35293fa148.tar.bz2
build _functools and _locale into the core library
-rwxr-xr-xconfigure4
-rw-r--r--configure.in2
-rw-r--r--setup.py18
3 files changed, 3 insertions, 21 deletions
diff --git a/configure b/configure
index 17b8367..ca9eac2 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 72504 .
+# From configure.in Revision: 72800 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for python 3.1.
#
@@ -13524,7 +13524,7 @@ then
# slowdown in stead of a speedup, maybe due to the large number of
# dynamic loads Python does.
- LINKFORSHARED="$extra_undefs"
+ LINKFORSHARED="$extra_undefs -framework CoreFoundation"
if test "$enable_framework"
then
LINKFORSHARED="$LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
diff --git a/configure.in b/configure.in
index 6937150..91f9a3b 100644
--- a/configure.in
+++ b/configure.in
@@ -1744,7 +1744,7 @@ then
# slowdown in stead of a speedup, maybe due to the large number of
# dynamic loads Python does.
- LINKFORSHARED="$extra_undefs"
+ LINKFORSHARED="$extra_undefs -framework CoreFoundation"
if test "$enable_framework"
then
LINKFORSHARED="$LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
diff --git a/setup.py b/setup.py
index ddd5452..f4adfd4 100644
--- a/setup.py
+++ b/setup.py
@@ -424,8 +424,6 @@ class PyBuildExt(build_ext):
exts.append( Extension("_heapq", ["_heapqmodule.c"]) )
# operator.add() and similar goodies
exts.append( Extension('operator', ['operator.c']) )
- # _functools
- exts.append( Extension("_functools", ["_functoolsmodule.c"]) )
# C-optimized pickle replacement
exts.append( Extension("_pickle", ["_pickle.c"]) )
# atexit
@@ -439,22 +437,6 @@ class PyBuildExt(build_ext):
exts.append( Extension('_lsprof', ['_lsprof.c', 'rotatingtree.c']) )
# static Unicode character database
exts.append( Extension('unicodedata', ['unicodedata.c']) )
- # access to ISO C locale support
- data = open('pyconfig.h').read()
- m = re.search(r"#s*define\s+WITH_LIBINTL\s+1\s*", data)
- if m is not None:
- locale_libs = ['intl']
- else:
- locale_libs = []
- if platform == 'darwin':
- locale_extra_link_args = ['-framework', 'CoreFoundation']
- else:
- locale_extra_link_args = []
-
-
- exts.append( Extension('_locale', ['_localemodule.c'],
- libraries=locale_libs,
- extra_link_args=locale_extra_link_args) )
# Modules with some UNIX dependencies -- on by default:
# (If you have a really backward UNIX, select and socket may not be