|
 |
58991e8 |
diff -rupN sip-4.19.9.dev1805261119/configure.py sip-4.19.9.dev1805261119-new/configure.py
|
|
|
58991e8 |
--- sip-4.19.9.dev1805261119/configure.py 2018-05-29 03:30:23.000000000 +0200
|
|
|
58991e8 |
+++ sip-4.19.9.dev1805261119-new/configure.py 2018-06-01 21:28:29.274744493 +0200
|
|
|
b39500a |
@@ -303,8 +303,8 @@ def create_config(module, template, macr
|
|
|
40c0f8a |
"sip_bin": os.path.join(sip_bin_dir, "sip"),
|
|
|
40c0f8a |
"sip_inc_dir": sip_inc_dir,
|
|
|
40c0f8a |
"sip_mod_dir": sip_module_dir,
|
|
|
40c0f8a |
- "default_bin_dir": plat_bin_dir,
|
|
|
40c0f8a |
- "default_mod_dir": plat_py_site_dir,
|
|
|
40c0f8a |
+ "default_bin_dir": sip_bin_dir,
|
|
|
40c0f8a |
+ "default_mod_dir": sip_module_dir,
|
|
|
40c0f8a |
"default_sip_dir": sip_sip_dir,
|
|
|
40c0f8a |
"py_version": py_version,
|
|
|
40c0f8a |
"py_inc_dir": plat_py_inc_dir,
|
|
|
58991e8 |
@@ -468,7 +468,8 @@ def create_makefiles(macros):
|
|
|
fee5098 |
if not opts.static:
|
|
|
fee5098 |
# These only need to be correct for Windows.
|
|
|
fee5098 |
debug_suffix = "_d" if opts.debug else ""
|
|
|
fee5098 |
- link_lib_dir = quote("-L" + cfg.py_lib_dir)
|
|
|
fee5098 |
+ py_lib = 'python%d.%d' % (sys.version_info.major, sys.version_info.minor)
|
|
|
fee5098 |
+ link_lib = "-L" + cfg.py_lib_dir + " -l" + py_lib
|
|
|
fee5098 |
|
|
|
fee5098 |
pro.write("""
|
|
|
fee5098 |
win32 {
|
|
|
58991e8 |
@@ -493,7 +494,7 @@ QMAKE_POST_LINK = $(COPY_FILE) $$PY_MODU
|
|
|
fee5098 |
target.CONFIG = no_check_exist
|
|
|
fee5098 |
target.files = $$PY_MODULE
|
|
|
fee5098 |
""" % (sip_module_base, debug_suffix,
|
|
|
fee5098 |
- link_lib_dir,
|
|
|
fee5098 |
+ link_lib,
|
|
|
fee5098 |
sip_module_base))
|
|
|
fee5098 |
|
|
|
fee5098 |
pro.write("\n")
|