diff options
| author | David Tardon <dtardon@redhat.com> | 2013-06-04 15:53:28 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-06-04 16:12:17 +0200 |
| commit | b8151270d24db4a3e813fbd76ead374e93c875da (patch) | |
| tree | 7dc11a34219218bd14295e1739f907917e288c0d | |
| parent | 660f54347433b05cb2d0ab081ddf6209aff47cd2 (diff) | |
fdo#65305 fix python on win
Apparently the native modules (.pyd) are expected directly in lib, not
in lib/lib-dynload like the .so's on linux.
Change-Id: Ic3181f189d9db51cb57630c4c1ea8741bbf879ec
(cherry picked from commit 424e936fc095c676a24c04acdd1eb1fbb6a27bed)
Signed-off-by: David Tardon <dtardon@redhat.com>
| -rw-r--r-- | python3/ExternalPackage_python3.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python3/ExternalPackage_python3.mk b/python3/ExternalPackage_python3.mk index abe7ac742b72..597062cd3f80 100644 --- a/python3/ExternalPackage_python3.mk +++ b/python3/ExternalPackage_python3.mk @@ -22,7 +22,7 @@ $(eval $(call gb_ExternalPackage_add_file,python3,$(gb_Package_PROGRAMDIRNAME)/p ifeq ($(MSVC_USE_DEBUG_RUNTIME),) $(eval $(call gb_ExternalPackage_add_file,python3,$(gb_Package_PROGRAMDIRNAME)/python$(PYTHON_VERSION_MAJOR).dll,LO_lib/$(python_arch_subdir)python$(PYTHON_VERSION_MAJOR).dll)) endif -$(eval $(call gb_ExternalPackage_add_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib/lib-dynload,\ +$(eval $(call gb_ExternalPackage_add_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib,\ LO_lib/$(python_arch_subdir)_ctypes$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \ LO_lib/$(python_arch_subdir)_ctypes_test$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \ LO_lib/$(python_arch_subdir)_decimal$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \ |