summaryrefslogtreecommitdiff
path: root/scp2/source/python/file_python.scp
diff options
context:
space:
mode:
authorHanno Meyer-Thurow <h.mth@web.de>2011-03-13 16:07:50 +0100
committerHanno Meyer-Thurow <h.mth@web.de>2011-03-14 18:47:10 +0100
commit189dcbf0639c5dc42474e0541f40f3358f745a6b (patch)
treed582717aa53da4541681f07e66fd102510e7d163 /scp2/source/python/file_python.scp
parent15b8ac2a753c8080549f7f0cd23aca485eda3ad0 (diff)
Merge Gentoo patches from old build and downstream repositories.
1. Do not add compiler default include and library path: potentially build against different version of system library than requested by the user. 2. Add a configure option to disable Python2 (PyUNO) bindings. Python3 is available for more than two years. Noone cares, therefore rest in peace. Python2 is going to be ditched at some point. Simply do not fail then. Windows builds need to be updated for BUILD_TYPE: "PYUNO". Or how is it handled nowadays? 3. Fix sandbox violation in officecfg module: rm /bin/<language>.zip 4. Add a configure option to search only in one place for JVMs, which is quite interesting for Linux Distributions. Enforce the user to place JVMs in one base directory. 5. Fix build for libxml-2.7.8 with ICU support. * config_office-XINC-XLIB-defaults.diff: (1) * disable-python.diff: (2) * gentoo-sandbox.diff: (3) * jvm-search-path.diff: (4) * libxmlsec_fix_extern_c.diff: (5)
Diffstat (limited to 'scp2/source/python/file_python.scp')
-rw-r--r--scp2/source/python/file_python.scp4
1 files changed, 4 insertions, 0 deletions
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp
index 122890012..ee2186bf5 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -27,6 +27,8 @@
#include "macros.inc"
+#ifndef DISABLE_PYUNO
+
File gid_File_Lib_Pyuno
TXT_FILE_BODY;
#ifdef UNX
@@ -310,3 +312,5 @@ End
#endif
+// DISABLE_PYUNO
+#endif