You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2021/01/08 18:09:45 UTC
[openoffice] branch AOO419 updated (5610821 -> db583c7)
This is an automated email from the ASF dual-hosted git repository.
ardovm pushed a change to branch AOO419
in repository https://gitbox.apache.org/repos/asf/openoffice.git.
from 5610821 Merge pull request #116 from ardovm/bug127952
new 00868dd Install Python libraries also from lib64
new db583c7 change c++ include paths on gcc >= 7
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
main/boost/boost_1_55_0.patch | 14 ++++++++++++++
main/python/prj/d.lst | 2 ++
2 files changed, 16 insertions(+)
[openoffice] 01/02: Install Python libraries also from lib64
Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ardovm pushed a commit to branch AOO419
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 00868dd069fea1f6ddd3b4adebe6635b6a5fab5b
Author: Arrigo Marchiori <ar...@yahoo.it>
AuthorDate: Tue Dec 8 09:44:04 2020 +0100
Install Python libraries also from lib64
---
main/python/prj/d.lst | 2 ++
1 file changed, 2 insertions(+)
diff --git a/main/python/prj/d.lst b/main/python/prj/d.lst
index 229edb6..78da281 100644
--- a/main/python/prj/d.lst
+++ b/main/python/prj/d.lst
@@ -82,8 +82,10 @@ mkdir: %_DEST%\lib%_EXT%\python\python2.7\config
..\%__SRC%\misc\build\python-inst\bin\python %_DEST%\bin%_EXT%\python
..\%__SRC%\misc\build\Python-2.7.18\pyconfig.h %_DEST%\inc%_EXT%\python\pyconfig.h
..\%__SRC%\misc\build\python-inst\lib\python2.7\lib-dynload\* %_DEST%\lib%_EXT%\python\lib-dynload\*
+..\%__SRC%\misc\build\python-inst\lib64\python2.7\lib-dynload\* %_DEST%\lib%_EXT%\python\lib-dynload\*
..\%__SRC%\misc\build\python-inst\bin\python2.7 %_DEST%\bin%_EXT%\python
..\%__SRC%\misc\build\python-inst\lib\libpython2.7.so.1.0 %_DEST%\lib%_EXT%\libpython2.7.so.1.0
+..\%__SRC%\misc\build\python-inst\lib64\libpython2.7.so.1.0 %_DEST%\lib%_EXT%\libpython2.7.so.1.0
symlink: %_DEST%\lib%_EXT%\libpython2.7.so.1.0 %_DEST%\lib%_EXT%\libpython2.7.so
# MacOS X
[openoffice] 02/02: change c++ include paths on gcc >= 7
Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ardovm pushed a commit to branch AOO419
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit db583c7a4493d28ab9766791cb060964295aa7a5
Author: Arrigo Marchiori <ar...@yahoo.it>
AuthorDate: Sat Nov 21 14:35:47 2020 +0100
change c++ include paths on gcc >= 7
---
main/boost/boost_1_55_0.patch | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/main/boost/boost_1_55_0.patch b/main/boost/boost_1_55_0.patch
index df9b8ec..b2042a0 100644
--- a/main/boost/boost_1_55_0.patch
+++ b/main/boost/boost_1_55_0.patch
@@ -359,3 +359,17 @@ diff -ur misc/boost_1_55_0/boost/config/compiler/gcc.hpp misc/build/boost_1_55_0
# define BOOST_HAS_VARIADIC_TMPL
# else
# define BOOST_NO_CXX11_VARIADIC_TEMPLATES
+--- misc/boost_1_55_0/boost/tr1/detail/config_all.hpp 2020-11-21 14:07:48.895886290 +0100
++++ misc/build/boost_1_55_0/boost/tr1/detail/config_all.hpp 2020-11-21 14:10:16.895419939 +0100
+@@ -95,6 +95,11 @@
+ // compiler version:
+ # define BOOST_TR1_STD_HEADER(name) <../4.0.0/name>
+ /*
++ * After version 6 the include path consists of the major number only
++ */
++# elif (__GNUC__ > 6)
++# define BOOST_TR1_STD_HEADER(name) <../__GNUC__/name>
++ /*
+ * Before version 3.4.0 the 0 patch level was not part of the include path:
+ */
+ # elif defined (__GNUC_PATCHLEVEL__) && ((__GNUC_PATCHLEVEL__ > 0) || \