1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #11824: Consider ABI tags in freeze. Patch by Meador Inge.

Browse Source
This commit is contained in:
Martin v. Löwis 2014-03-30 20:28:52 +02:00
parent 589872cbdf
commit a7fcd926e8
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS
View File

@ -137,6 +137,8 @@ Tests
Tools/Demos Tools/Demos
----------- -----------
- Issue #11824: Consider ABI tags in freeze. Patch by Meador Inge.
- Issue #20535: PYTHONWARNING no longer affects the run_tests.py script. - Issue #20535: PYTHONWARNING no longer affects the run_tests.py script.
Patch by Arfrever Frehtes Taifersar Arahesis. Patch by Arfrever Frehtes Taifersar Arahesis.

10
Tools/freeze/freeze.py
View File

@ -219,6 +219,7 @@ def main():
# locations derived from options # locations derived from options
version = sys.version[:3] version = sys.version[:3]
flagged_version = version + sys.abiflags
if win: if win:
extensions_c = 'frozen_extensions.c' extensions_c = 'frozen_extensions.c'
if ishome: if ishome:
@ -233,10 +234,11 @@ def main():
frozendllmain_c = os.path.join(exec_prefix, 'Pc\\frozen_dllmain.c') frozendllmain_c = os.path.join(exec_prefix, 'Pc\\frozen_dllmain.c')
else: else:
binlib = os.path.join(exec_prefix, binlib = os.path.join(exec_prefix,
'lib', 'python%s' % version, 'config') 'lib', 'python%s' % version,
incldir = os.path.join(prefix, 'include', 'python%s' % version) 'config-%s' % flagged_version)
incldir = os.path.join(prefix, 'include', 'python%s' % flagged_version)
config_h_dir = os.path.join(exec_prefix, 'include', config_h_dir = os.path.join(exec_prefix, 'include',
'python%s' % version) 'python%s' % flagged_version)
config_c_in = os.path.join(binlib, 'config.c.in') config_c_in = os.path.join(binlib, 'config.c.in')
frozenmain_c = os.path.join(binlib, 'frozenmain.c') frozenmain_c = os.path.join(binlib, 'frozenmain.c')
makefile_in = os.path.join(binlib, 'Makefile') makefile_in = os.path.join(binlib, 'Makefile')
@ -455,7 +457,7 @@ def main():
cflags = ['$(OPT)'] cflags = ['$(OPT)']
cppflags = defines + includes cppflags = defines + includes
libs = [os.path.join(binlib, 'libpython$(VERSION).a')] libs = [os.path.join(binlib, '$(LDLIBRARY)')]
somevars = {} somevars = {}
if os.path.exists(makefile_in): if os.path.exists(makefile_in):