[Python-checkins] cpython (merge 3.4 -> default): Merge 3.4: Issue #11824: Consider ABI tags in freeze. Patch by Meador Inge.

[martin.v.loewis]

http://hg.python.org/cpython/rev/1b6fc88ae3f5
changeset:   90043:1b6fc88ae3f5
parent:      90041:023b119f20eb
parent:      90042:4e37a4a036c6
user:        Martin v. Löwis <martin at v.loewis.de>
date:        Sun Mar 30 20:29:56 2014 +0200
summary:
  Merge 3.4: Issue #11824: Consider ABI tags in freeze. Patch by Meador Inge.

files:
  Misc/NEWS              |   2 ++
  Tools/freeze/freeze.py |  10 ++++++----
  2 files changed, 8 insertions(+), 4 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -169,6 +169,8 @@
 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
--- a/Tools/freeze/freeze.py
+++ b/Tools/freeze/freeze.py
@@ -219,6 +219,7 @@
 
     # 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 @@
             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 @@
 
     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):

-- 
Repository URL: http://hg.python.org/cpython