cpython: 227ce85bdbe0 (original) (raw)

Mercurial > cpython

changeset 90961:227ce85bdbe0

Issue #17095: Fix Modules/Setup *shared* support. Original patch by Thomas Wouters. [#17095]

Ned Deily nad@acm.org
date	Mon, 02 Jun 2014 01:15:32 -0700
parents	ca2539818a6a(current diff)6c468df214dc(diff)
children	dc3afbee4ad1
files	Misc/NEWS
diffstat	3 files changed, 18 insertions(+), 6 deletions(-)[+] [-] Misc/NEWS 2 Modules/getpath.c 14 Modules/makesetup 8

line wrap: on

line diff

--- a/Misc/NEWS +++ b/Misc/NEWS @@ -498,6 +498,8 @@ Build

Issue #15968: Incorporated Tcl, Tk, and Tix builds into the Windows build solution. +- Issue #17095: Fix Modules/Setup shared support. + C API -----
Issue #20942: PyImport_ImportFrozenModuleObject() no longer sets file to

--- a/Modules/getpath.c +++ b/Modules/getpath.c @@ -734,6 +734,11 @@ calculate_path(void) bufsz += wcslen(zip_path) + 1; bufsz += wcslen(exec_prefix) + 1;

/* When running from the build directory, add room for the Modules
```
* subdirectory too.[](#l2.8)
```
```
*/[](#l2.9)
```
if (efound == -1)

   bufsz += wcslen(argv0_path) + wcslen(L"Modules") + 2;[](#l2.11)

buf = (wchar_t )PyMem_Malloc(bufsz * sizeof(wchar_t)); if (buf == NULL) { @@ -781,6 +786,15 @@ calculate_path(void) / Finally, on goes the directory for dynamic-load modules */ wcscat(buf, exec_prefix);

/* And, if we run from a build directory, the Modules directory (for
- modules built with Modules/Setup.)
*/
if (efound == -1) {
```
  wcscat(buf, delimiter);[](#l2.23)
```
```
  wcscat(buf, argv0_path);[](#l2.24)
```
```
  wcscat(buf, separator);[](#l2.25)
```
```
  wcscat(buf, L"Modules");[](#l2.26)
```
} /* And publish the results */ module_search_path = buf;

--- a/Modules/makesetup +++ b/Modules/makesetup @@ -217,7 +217,7 @@ sed -e 's/[ ]#.//' -e '/^[ ]$/d' | ) src='$(srcdir)/'"$srcdir/$src";; esac case $doconfig in - no) cc="$cc $(CCSHARED) $(CFLAGS) $(CPPFLAGS)";; + no) cc="$cc $(CCSHARED) $(PY_CFLAGS) $(PY_CPPFLAGS)";; ) cc="$cc $(PY_CORE_CFLAGS)";; esac @@ -229,11 +229,7 @@ sed -e 's/[ ]#.//' -e '/^[ ]$/d' | esac for mod in $mods do - case $objs in - $mod.o) base=$mod;; - *) base=${mod}module;; - esac - file="$srcdir/$base$(SO)" + file="$srcdir/$mod$(EXT_SUFFIX)" case $doconfig in no) SHAREDMODS="$SHAREDMODS $file";; esac