diff options
| author | Yuri Dario <ydario@apache.org> | 2014-02-17 18:08:12 +0000 |
|---|---|---|
| committer | Yuri Dario <ydario@apache.org> | 2014-02-17 18:08:12 +0000 |
| commit | 60f06b770338e6c4f9da8e9d9322f969a2742bd0 (patch) | |
| tree | 2ac338d74130e3eabe984093e38da1d5e1642254 /boost | |
| parent | 8d769be834186ae6aa05e64d88b95a6b9d874c2e (diff) | |
#i123817# restored OS/2 boost patches.
Notes
Notes:
ignore: OS/2
Diffstat (limited to 'boost')
| -rw-r--r-- | boost/boost-os2.patch | 22 | ||||
| -rw-r--r-- | boost/makefile.mk | 3 |
2 files changed, 25 insertions, 0 deletions
diff --git a/boost/boost-os2.patch b/boost/boost-os2.patch new file mode 100644 index 000000000000..2c23a877bc24 --- /dev/null +++ b/boost/boost-os2.patch @@ -0,0 +1,22 @@ +--- misc/boost_1_55_0/boost/tr1/detail/config.hpp 2010-06-12 11:30:02.000000000 +0200
++++ misc/build/boost_1_55_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_55_0/boost/tr1/detail/config_all.hpp 2011-07-25 11:28:58.000000000 +0200
++++ misc/build/boost_1_55_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_55_0/libs/math/quaternion/TQE_EA.pdf and misc/build/boost_1_55_0/libs/math/quaternion/TQE_EA.pdf differ
diff --git a/boost/makefile.mk b/boost/makefile.mk index a63ed3795b9a..141de168330a 100644 --- a/boost/makefile.mk +++ b/boost/makefile.mk @@ -47,6 +47,9 @@ all: TARFILE_NAME=boost_1_55_0 TARFILE_MD5=d6eef4b4cacb2183f2bf265a5a03a354 PATCH_FILES= $(TARFILE_NAME).patch +.IF "$(GUI)"=="OS2" +PATCH_FILES+=boost-os2.patch +.ENDIF CONFIGURE_DIR= CONFIGURE_ACTION= |