diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2014-03-30 18:29:56 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2014-03-30 18:29:56 (GMT) |
| commit | 6e50ccd3031826fd7e232bece040a36b740c2dd2 (patch) | |
| tree | 850c75c54c3365645ff9cc6845f12f4686aa5706 | |
| parent | 80c09cfa491777e46bdb2792ee457b22ccb09a81 (diff) | |
| parent | a7fcd926e890f64ee427cf8890a6507c6b1342ef (diff) | |
| download | cpython-6e50ccd3031826fd7e232bece040a36b740c2dd2.zip cpython-6e50ccd3031826fd7e232bece040a36b740c2dd2.tar.gz cpython-6e50ccd3031826fd7e232bece040a36b740c2dd2.tar.bz2 | |
Merge 3.4: Issue #11824: Consider ABI tags in freeze. Patch by Meador Inge.
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rwxr-xr-x | Tools/freeze/freeze.py | 10 |
2 files changed, 8 insertions, 4 deletions
@@ -169,6 +169,8 @@ Tests Tools/Demos ----------- +- Issue #11824: Consider ABI tags in freeze. Patch by Meador Inge. + - Issue #20535: PYTHONWARNING no longer affects the run_tests.py script. Patch by Arfrever Frehtes Taifersar Arahesis. diff --git a/Tools/freeze/freeze.py b/Tools/freeze/freeze.py index 479ca3c..d0e3c3f 100755 --- a/Tools/freeze/freeze.py +++ b/Tools/freeze/freeze.py @@ -219,6 +219,7 @@ def main(): # locations derived from options version = sys.version[:3] + flagged_version = version + sys.abiflags if win: extensions_c = 'frozen_extensions.c' if ishome: @@ -233,10 +234,11 @@ def main(): frozendllmain_c = os.path.join(exec_prefix, 'Pc\\frozen_dllmain.c') else: binlib = os.path.join(exec_prefix, - 'lib', 'python%s' % version, 'config') - incldir = os.path.join(prefix, 'include', 'python%s' % version) + 'lib', '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', - 'python%s' % version) + 'python%s' % flagged_version) config_c_in = os.path.join(binlib, 'config.c.in') frozenmain_c = os.path.join(binlib, 'frozenmain.c') makefile_in = os.path.join(binlib, 'Makefile') @@ -455,7 +457,7 @@ def main(): cflags = ['$(OPT)'] cppflags = defines + includes - libs = [os.path.join(binlib, 'libpython$(VERSION).a')] + libs = [os.path.join(binlib, '$(LDLIBRARY)')] somevars = {} if os.path.exists(makefile_in): |