Skip to content

Commit

Permalink
build _functools and _locale into the core library
Browse files Browse the repository at this point in the history
  • Loading branch information
benjaminp committed May 23, 2009
1 parent 932073a commit 9c80cac
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 21 deletions.
4 changes: 2 additions & 2 deletions configure
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down Expand Up @@ -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)'
Expand Down
2 changes: 1 addition & 1 deletion configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -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)'
Expand Down
18 changes: 0 additions & 18 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -424,8 +424,6 @@ def detect_modules(self):
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
Expand All @@ -439,22 +437,6 @@ def detect_modules(self):
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
Expand Down

0 comments on commit 9c80cac

Please sign in to comment.