diff options
-rw-r--r-- | RepositoryModule_host.mk | 1 | ||||
-rw-r--r-- | external/Module_external.mk | 1 | ||||
-rw-r--r-- | external/python3/ExternalPackage_python3.mk (renamed from python3/ExternalPackage_python3.mk) | 0 | ||||
-rw-r--r-- | external/python3/ExternalProject_python3.mk (renamed from python3/ExternalProject_python3.mk) | 0 | ||||
-rw-r--r-- | external/python3/GeneratedPackage_python3.mk (renamed from python3/GeneratedPackage_python3.mk) | 0 | ||||
-rw-r--r-- | external/python3/Makefile (renamed from python3/Makefile) | 2 | ||||
-rw-r--r-- | external/python3/Module_python3.mk (renamed from python3/Module_python3.mk) | 0 | ||||
-rw-r--r-- | external/python3/README (renamed from python3/README) | 0 | ||||
-rw-r--r-- | external/python3/UnpackedTarball_python3.mk (renamed from python3/UnpackedTarball_python3.mk) | 30 | ||||
-rw-r--r-- | external/python3/i100492-freebsd.patch.1 (renamed from python3/i100492-freebsd.patch.1) | 0 | ||||
-rw-r--r-- | external/python3/python-3.3.0-15833.patch.1 (renamed from python3/python-3.3.0-15833.patch.1) | 0 | ||||
-rw-r--r-- | external/python3/python-3.3.0-aix.patch.1 (renamed from python3/python-3.3.0-aix.patch.1) | 0 | ||||
-rw-r--r-- | external/python3/python-3.3.0-clang.patch.1 (renamed from python3/python-3.3.0-clang.patch.1) | 0 | ||||
-rw-r--r-- | external/python3/python-3.3.0-darwin.patch.1 (renamed from python3/python-3.3.0-darwin.patch.1) | 0 | ||||
-rw-r--r-- | external/python3/python-3.3.0-elf-rpath.patch.1 (renamed from python3/python-3.3.0-elf-rpath.patch.1) | 0 | ||||
-rw-r--r-- | external/python3/python-3.3.0-ffi-clang.patch.1 (renamed from python3/python-3.3.0-ffi-clang.patch.1) | 0 | ||||
-rw-r--r-- | external/python3/python-3.3.0-gcc-4.8.patch.1 (renamed from python3/python-3.3.0-gcc-4.8.patch.1) | 0 | ||||
-rw-r--r-- | external/python3/python-3.3.0-i42553.patch.2 (renamed from python3/python-3.3.0-i42553.patch.2) | 0 | ||||
-rw-r--r-- | external/python3/python-3.3.0-implicit-int.patch.1 (renamed from python3/python-3.3.0-implicit-int.patch.1) | 0 | ||||
-rw-r--r-- | external/python3/python-3.3.0-msvc-disable.patch.1 (renamed from python3/python-3.3.0-msvc-disable.patch.1) | 0 | ||||
-rw-r--r-- | external/python3/python-3.3.0-msvc-x64.patch.1 (renamed from python3/python-3.3.0-msvc-x64.patch.1) | 0 | ||||
-rw-r--r-- | external/python3/python-3.3.0-msvc2012.patch.1 (renamed from python3/python-3.3.0-msvc2012.patch.1) | 0 | ||||
-rw-r--r-- | external/python3/python-3.3.0-pythreadstate.patch.1 (renamed from python3/python-3.3.0-pythreadstate.patch.1) | 0 | ||||
-rw-r--r-- | external/python3/python-3.3.0-ssl.patch.1 (renamed from python3/python-3.3.0-ssl.patch.1) | 0 |
24 files changed, 17 insertions, 17 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 253c52e76754..cf4d8c3d00a3 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -87,7 +87,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ padmin \ postprocess \ psprint_config \ - $(call gb_Helper_optional,PYTHON,python3) \ $(call gb_Helper_optional,PYUNO,pyuno) \ $(call gb_Helper_optional,QADEVOOO,qadevOOo) \ readlicense_oo \ diff --git a/external/Module_external.mk b/external/Module_external.mk index d7b041b02d4b..45f0ba26ae59 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -70,6 +70,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,ORCUS,liborcus) \ $(call gb_Helper_optional,POPPLER,poppler) \ $(call gb_Helper_optional,POSTGRESQL,postgresql) \ + $(call gb_Helper_optional,PYTHON,python3) \ $(call gb_Helper_optional,VISIO,libvisio) \ $(call gb_Helper_optional,WPD,libwpd) \ $(call gb_Helper_optional,WPG,libwpg) \ diff --git a/python3/ExternalPackage_python3.mk b/external/python3/ExternalPackage_python3.mk index ac8e856d9ad0..ac8e856d9ad0 100644 --- a/python3/ExternalPackage_python3.mk +++ b/external/python3/ExternalPackage_python3.mk diff --git a/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk index 70063f0f52eb..70063f0f52eb 100644 --- a/python3/ExternalProject_python3.mk +++ b/external/python3/ExternalProject_python3.mk diff --git a/python3/GeneratedPackage_python3.mk b/external/python3/GeneratedPackage_python3.mk index 8ca47a919b7d..8ca47a919b7d 100644 --- a/python3/GeneratedPackage_python3.mk +++ b/external/python3/GeneratedPackage_python3.mk diff --git a/python3/Makefile b/external/python3/Makefile index ccb1c85a04da..e4968cf85fb6 100644 --- a/python3/Makefile +++ b/external/python3/Makefile @@ -2,6 +2,6 @@ module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) -include $(module_directory)/../solenv/gbuild/partial_build.mk +include $(module_directory)/../../solenv/gbuild/partial_build.mk # vim: set noet sw=4 ts=4: diff --git a/python3/Module_python3.mk b/external/python3/Module_python3.mk index eb2ec39ecb0b..eb2ec39ecb0b 100644 --- a/python3/Module_python3.mk +++ b/external/python3/Module_python3.mk diff --git a/python3/README b/external/python3/README index edde023afcda..edde023afcda 100644 --- a/python3/README +++ b/external/python3/README diff --git a/python3/UnpackedTarball_python3.mk b/external/python3/UnpackedTarball_python3.mk index fb30a40048cb..62cc55e09e32 100644 --- a/python3/UnpackedTarball_python3.mk +++ b/external/python3/UnpackedTarball_python3.mk @@ -20,30 +20,30 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,python3,\ )) $(eval $(call gb_UnpackedTarball_add_patches,python3,\ - python3/i100492-freebsd.patch.1 \ - python3/python-3.3.0-i42553.patch.2 \ - python3/python-3.3.0-aix.patch.1 \ - python3/python-3.3.0-darwin.patch.1 \ - python3/python-3.3.0-msvc2012.patch.1 \ - python3/python-3.3.0-msvc-disable.patch.1 \ - python3/python-3.3.0-msvc-x64.patch.1 \ - python3/python-3.3.0-ssl.patch.1 \ - python3/python-3.3.0-implicit-int.patch.1 \ - python3/python-3.3.0-ffi-clang.patch.1 \ - python3/python-3.3.0-gcc-4.8.patch.1 \ - python3/python-3.3.0-pythreadstate.patch.1 \ - python3/python-3.3.0-clang.patch.1 \ + external/python3/i100492-freebsd.patch.1 \ + external/python3/python-3.3.0-i42553.patch.2 \ + external/python3/python-3.3.0-aix.patch.1 \ + external/python3/python-3.3.0-darwin.patch.1 \ + external/python3/python-3.3.0-msvc2012.patch.1 \ + external/python3/python-3.3.0-msvc-disable.patch.1 \ + external/python3/python-3.3.0-msvc-x64.patch.1 \ + external/python3/python-3.3.0-ssl.patch.1 \ + external/python3/python-3.3.0-implicit-int.patch.1 \ + external/python3/python-3.3.0-ffi-clang.patch.1 \ + external/python3/python-3.3.0-gcc-4.8.patch.1 \ + external/python3/python-3.3.0-pythreadstate.patch.1 \ + external/python3/python-3.3.0-clang.patch.1 \ )) ifneq ($(OS),WNT) $(eval $(call gb_UnpackedTarball_add_patches,python3,\ - python3/python-3.3.0-15833.patch.1 \ + external/python3/python-3.3.0-15833.patch.1 \ )) endif ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD SOLARIS,$(OS)),) $(eval $(call gb_UnpackedTarball_add_patches,python3,\ - python3/python-3.3.0-elf-rpath.patch.1 \ + external/python3/python-3.3.0-elf-rpath.patch.1 \ )) endif diff --git a/python3/i100492-freebsd.patch.1 b/external/python3/i100492-freebsd.patch.1 index d797ac14f826..d797ac14f826 100644 --- a/python3/i100492-freebsd.patch.1 +++ b/external/python3/i100492-freebsd.patch.1 diff --git a/python3/python-3.3.0-15833.patch.1 b/external/python3/python-3.3.0-15833.patch.1 index 7cb845f07312..7cb845f07312 100644 --- a/python3/python-3.3.0-15833.patch.1 +++ b/external/python3/python-3.3.0-15833.patch.1 diff --git a/python3/python-3.3.0-aix.patch.1 b/external/python3/python-3.3.0-aix.patch.1 index f8dceb2a4c1f..f8dceb2a4c1f 100644 --- a/python3/python-3.3.0-aix.patch.1 +++ b/external/python3/python-3.3.0-aix.patch.1 diff --git a/python3/python-3.3.0-clang.patch.1 b/external/python3/python-3.3.0-clang.patch.1 index 9001110fbed4..9001110fbed4 100644 --- a/python3/python-3.3.0-clang.patch.1 +++ b/external/python3/python-3.3.0-clang.patch.1 diff --git a/python3/python-3.3.0-darwin.patch.1 b/external/python3/python-3.3.0-darwin.patch.1 index a32b7f588b01..a32b7f588b01 100644 --- a/python3/python-3.3.0-darwin.patch.1 +++ b/external/python3/python-3.3.0-darwin.patch.1 diff --git a/python3/python-3.3.0-elf-rpath.patch.1 b/external/python3/python-3.3.0-elf-rpath.patch.1 index 0007d6b2e71e..0007d6b2e71e 100644 --- a/python3/python-3.3.0-elf-rpath.patch.1 +++ b/external/python3/python-3.3.0-elf-rpath.patch.1 diff --git a/python3/python-3.3.0-ffi-clang.patch.1 b/external/python3/python-3.3.0-ffi-clang.patch.1 index 0dcbc42d13a4..0dcbc42d13a4 100644 --- a/python3/python-3.3.0-ffi-clang.patch.1 +++ b/external/python3/python-3.3.0-ffi-clang.patch.1 diff --git a/python3/python-3.3.0-gcc-4.8.patch.1 b/external/python3/python-3.3.0-gcc-4.8.patch.1 index 8fb7107ff299..8fb7107ff299 100644 --- a/python3/python-3.3.0-gcc-4.8.patch.1 +++ b/external/python3/python-3.3.0-gcc-4.8.patch.1 diff --git a/python3/python-3.3.0-i42553.patch.2 b/external/python3/python-3.3.0-i42553.patch.2 index 21145227cc1e..21145227cc1e 100644 --- a/python3/python-3.3.0-i42553.patch.2 +++ b/external/python3/python-3.3.0-i42553.patch.2 diff --git a/python3/python-3.3.0-implicit-int.patch.1 b/external/python3/python-3.3.0-implicit-int.patch.1 index 6e4d2b05127d..6e4d2b05127d 100644 --- a/python3/python-3.3.0-implicit-int.patch.1 +++ b/external/python3/python-3.3.0-implicit-int.patch.1 diff --git a/python3/python-3.3.0-msvc-disable.patch.1 b/external/python3/python-3.3.0-msvc-disable.patch.1 index e9cbef594786..e9cbef594786 100644 --- a/python3/python-3.3.0-msvc-disable.patch.1 +++ b/external/python3/python-3.3.0-msvc-disable.patch.1 diff --git a/python3/python-3.3.0-msvc-x64.patch.1 b/external/python3/python-3.3.0-msvc-x64.patch.1 index 7071573c04ac..7071573c04ac 100644 --- a/python3/python-3.3.0-msvc-x64.patch.1 +++ b/external/python3/python-3.3.0-msvc-x64.patch.1 diff --git a/python3/python-3.3.0-msvc2012.patch.1 b/external/python3/python-3.3.0-msvc2012.patch.1 index 9bbfbfbaf0d6..9bbfbfbaf0d6 100644 --- a/python3/python-3.3.0-msvc2012.patch.1 +++ b/external/python3/python-3.3.0-msvc2012.patch.1 diff --git a/python3/python-3.3.0-pythreadstate.patch.1 b/external/python3/python-3.3.0-pythreadstate.patch.1 index 66350e2c8112..66350e2c8112 100644 --- a/python3/python-3.3.0-pythreadstate.patch.1 +++ b/external/python3/python-3.3.0-pythreadstate.patch.1 diff --git a/python3/python-3.3.0-ssl.patch.1 b/external/python3/python-3.3.0-ssl.patch.1 index d5777dfc3252..d5777dfc3252 100644 --- a/python3/python-3.3.0-ssl.patch.1 +++ b/external/python3/python-3.3.0-ssl.patch.1 |