Author: ydario
Date: Sat Jul 6 07:45:59 2013
New Revision: 1500221
URL: http://svn.apache.org/r1500221
Log:
i122692 i118923 - OS/2 port: boost build fixes.
Added:
openoffice/trunk/main/boost/boost-os2.patch
Modified:
openoffice/trunk/main/boost/makefile.mk
Added: openoffice/trunk/main/boost/boost-os2.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/boost/boost-os2.patch?rev=1500221&view=auto
==============================================================================
--- openoffice/trunk/main/boost/boost-os2.patch (added)
+++ openoffice/trunk/main/boost/boost-os2.patch Sat Jul 6 07:45:59 2013
@@ -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
Modified: openoffice/trunk/main/boost/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/boost/makefile.mk?rev=1500221&r1=1500220&r2=1500221&view=diff
==============================================================================
--- openoffice/trunk/main/boost/makefile.mk (original)
+++ openoffice/trunk/main/boost/makefile.mk Sat Jul 6 07:45:59 2013
@@ -49,6 +49,9 @@ TARFILE_MD5=d1e9a7a7f532bb031a3c175d8668
PATCH_FILES=\
$(TARFILE_NAME).patch \
boost_freebsd.patch
+.IF "$(GUI)"=="OS2"
+PATCH_FILES+=boost-os2.patch
+.ENDIF
CONFIGURE_DIR=
CONFIGURE_ACTION=
