diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-04-21 14:34:50 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-04-22 11:33:25 +0000 |
| commit | b6bcbb675afedba0c47654dd78dc446dac0630d1 (patch) | |
| tree | 029c1e80c0b7248149e4eb46381ed15901d3013b /RepositoryExternal.mk | |
| parent | 60a466c0363eaa9b2692323f4d2ac98683366c3b (diff) | |
replace python-core zip built in pyuno with direct use of Package
- python3: deliver files to INSTDIR, with same layout as instset
and do not deliver .lib files
- pyuno: remove obsolete python.bin targets
- pyuno: remove usage of CustomTarget_zip for WNT and non-Mac UNX
platforms (sadly it is apparently still needed for "system" python on
MinGW)
- scp2: use the python3 filelist
There is still a problem here because the installer does not currently
allow to preserve the executable bit on files in a filelist
- RepositoryExternal: run python executable from INSTDIR
and link against libraries in UnpackedTarball dir
Change-Id: I931ca0a8be6ff40051b1ca50da1f0770e6057832
Reviewed-on: https://gerrit.libreoffice.org/3525
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index df44d2d02067..f3ee5dd5eb04 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2300,15 +2300,16 @@ $(call gb_LinkTarget__use_python_headers,$(1)) ifeq ($(OS),WNT) $(call gb_LinkTarget_add_libs,$(1),\ - python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).lib \ + $(call gb_UnpackedTarball_get_dir,python3)/$(if $(filter 90,$(VCVER)),PC/VS9.0,PCbuild)$(if $(filter X86_64,$(CPUNAME)),/amd64)/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).lib \ ) else ifeq ($(OS),MACOSX) $(call gb_LinkTarget_add_libs,$(1),\ -F$(call gb_UnpackedTarball_get_dir,python3)/python-inst/@__________________________________________________OOO -framework LibreOfficePython \ ) else -$(call gb_LinkTarget_use_libraries,$(1),\ - python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m \ +$(call gb_LinkTarget_add_libs,$(1),\ + -L$(call gb_UnpackedTarball_get_dir,python3) \ + -lpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m \ ) endif @@ -2888,8 +2889,8 @@ $(call gb_ExternalExecutable_add_dependencies,python,$(call gb_Zip_get_outdir_ta else -$(call gb_ExternalExecutable_set_internal,python) -$(call gb_ExternalExecutable_set_precommand,python,$(gb_PYTHON_PRECOMMAND)) +$(call gb_ExternalExecutable_set_internal,python,$(INSTDIR)/program/$(if $(filter WNT,$(OS)),python-core-$(PYTHON_VERSION)/bin/python.exe,python.bin)) +$(call gb_ExternalExecutable_set_precommand,python,$(gb_Python_PRECOMMAND)) $(call gb_ExternalExecutable_add_dependencies,python,$(call gb_Package_get_target_for_build,python3)) endif |