mirror of
https://github.com/python/cpython.git
synced 2025-08-03 16:39:00 +00:00
Change code in setup.py for parsing LDFLAGS and CPPFLAGS to use optparse
instead of getopt. Required making use of gettext._ as optional (optparse changed OK'ed by Greg Ward in private email).
This commit is contained in:
parent
516592f4ff
commit
84667c063a
3 changed files with 11 additions and 7 deletions
11
setup.py
11
setup.py
|
@ -3,7 +3,7 @@
|
|||
|
||||
__version__ = "$Revision$"
|
||||
|
||||
import sys, os, imp, re, getopt
|
||||
import sys, os, imp, re, optparse
|
||||
|
||||
from distutils import log
|
||||
from distutils import sysconfig
|
||||
|
@ -253,11 +253,10 @@ class PyBuildExt(build_ext):
|
|||
('CPPFLAGS', '-I', self.compiler.include_dirs)):
|
||||
env_val = os.getenv(env_var)
|
||||
if env_val:
|
||||
# getopt is used instead of optparse because the latter imports
|
||||
# gettext which imports struct which has not been built yet
|
||||
# when this method is needed
|
||||
options = getopt.getopt(env_val.split(), arg_name[1] + ':')[0]
|
||||
for arg_option, directory in options:
|
||||
parser = optparse.OptionParser()
|
||||
parser.add_option(arg_name, dest="dirs", action="append")
|
||||
options = parser.parse_args(env_val.split())[0]
|
||||
for directory in options.dirs:
|
||||
add_dir_to_list(dir_list, directory)
|
||||
|
||||
if os.path.normpath(sys.prefix) != '/usr':
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue