boost/boost-os2.patch | 22 ++++++++++++++++++++++ boost/makefile.mk | 3 +++ 2 files changed, 25 insertions(+)
New commits: commit 74b5b7cd1a42e08a1195c3e225d2a224a7102d3a Author: Yuri Dario <yda...@apache.org> Date: Sat Jul 6 07:45:59 2013 +0000 i122692 i118923 - OS/2 port: boost build fixes. diff --git a/boost/boost-os2.patch b/boost/boost-os2.patch new file mode 100644 index 0000000..ccba8b0 --- /dev/null +++ b/boost/boost-os2.patch @@ -0,0 +1,22 @@ +--- misc/boost_1_48_0/boost/tr1/detail/config.hpp 2010-06-12 11:30:02.000000000 +0200 ++++ misc/build/boost_1_48_0/boost/tr1/detail/config.hpp 2013-07-04 12:49:12.000000000 +0200 +@@ -9,6 +9,7 @@ + #include <cstddef> + + #if (defined(__GNUC__) && !(defined(linux) || defined(__linux) || defined(__linux__))) \ ++ && !defined(__OS2__) \ + || (!defined(_AIX) && defined(__IBMCPP__) && (__IBMCPP__ >= 800)) + // Disable use of #include_next on Linux as typically we are installed in a + // directory that is searched *after* the std lib include path. +--- misc/boost_1_48_0/boost/tr1/detail/config_all.hpp 2011-07-25 11:28:58.000000000 +0200 ++++ misc/build/boost_1_48_0/boost/tr1/detail/config_all.hpp 2013-07-04 12:50:44.000000000 +0200 +@@ -107,7 +107,7 @@ + # endif + + # if !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT) && !defined(__ICC) \ +- && (defined(linux) || defined(__linux) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)) ++ && (defined(__OS2__) || defined(linux) || defined(__linux) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)) + // Disable use of #include_next on Linux as typically we are installed in a directory that is searched + // *after* the std lib include path: + # define BOOST_TR1_DISABLE_INCLUDE_NEXT +Binary files misc/boost_1_48_0/libs/math/quaternion/TQE_EA.pdf and misc/build/boost_1_48_0/libs/math/quaternion/TQE_EA.pdf differ diff --git a/boost/makefile.mk b/boost/makefile.mk index 18e988d..f77f15a 100644 --- a/boost/makefile.mk +++ b/boost/makefile.mk @@ -49,6 +49,9 @@ TARFILE_MD5=d1e9a7a7f532bb031a3c175d86688d95 PATCH_FILES=\ $(TARFILE_NAME).patch \ boost_freebsd.patch +.IF "$(GUI)"=="OS2" +PATCH_FILES+=boost-os2.patch +.ENDIF CONFIGURE_DIR= CONFIGURE_ACTION= _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits