aboutsummaryrefslogtreecommitdiffstats
path: root/cad/opencascade
diff options
context:
space:
mode:
authorthierry <thierry@FreeBSD.org>2014-10-18 22:38:06 +0800
committerthierry <thierry@FreeBSD.org>2014-10-18 22:38:06 +0800
commitd12ce2a3f6df9776272f5be26998821460368d66 (patch)
treeef84b1c0ef7963bf89cd91b6c3f0d4cb7a0ce00a /cad/opencascade
parentd053f227b488c78c69dc0b1430636b92d39caa4e (diff)
downloadfreebsd-ports-gnome-d12ce2a3f6df9776272f5be26998821460368d66.tar.gz
freebsd-ports-gnome-d12ce2a3f6df9776272f5be26998821460368d66.tar.zst
freebsd-ports-gnome-d12ce2a3f6df9776272f5be26998821460368d66.zip
Fix build on FreeBSD-8.4.
Diffstat (limited to 'cad/opencascade')
-rw-r--r--cad/opencascade/files/patch-inc_Standard_CLocaleSentry.hxx2
-rw-r--r--cad/opencascade/files/patch-src_Standard_Standard_CString.cxx11
2 files changed, 12 insertions, 1 deletions
diff --git a/cad/opencascade/files/patch-inc_Standard_CLocaleSentry.hxx b/cad/opencascade/files/patch-inc_Standard_CLocaleSentry.hxx
index a2ec473bd88e..02956ae04166 100644
--- a/cad/opencascade/files/patch-inc_Standard_CLocaleSentry.hxx
+++ b/cad/opencascade/files/patch-inc_Standard_CLocaleSentry.hxx
@@ -5,7 +5,7 @@
//! since POSIX didn't declared such identifier.
//! We check _GNU_SOURCE for glibc extensions here and it is always defined by g++ compiler.
-#if defined(__APPLE__) || defined(_GNU_SOURCE) || defined(HAVE_XLOCALE_H)
-+#if defined(__APPLE__) || defined(_GNU_SOURCE) || (defined(__FreeBSD__) && (__FreeBSD_version < 910000)) || defined(HAVE_XLOCALE_H)
++#if defined(__APPLE__) || defined(_GNU_SOURCE) || (defined(__FreeBSD__) && (__FreeBSD_version > 910000)) || defined(HAVE_XLOCALE_H)
#include <xlocale.h>
#ifndef HAVE_XLOCALE_H
#define HAVE_XLOCALE_H
diff --git a/cad/opencascade/files/patch-src_Standard_Standard_CString.cxx b/cad/opencascade/files/patch-src_Standard_Standard_CString.cxx
new file mode 100644
index 000000000000..09ec78e11cde
--- /dev/null
+++ b/cad/opencascade/files/patch-src_Standard_Standard_CString.cxx
@@ -0,0 +1,11 @@
+--- src/Standard/Standard_CString.cxx.orig 2014-04-29 11:40:41.000000000 +0200
++++ src/Standard/Standard_CString.cxx 2014-10-18 16:05:36.000000000 +0200
+@@ -94,7 +94,7 @@
+ // So we switch to C locale temporarily
+ #define SAVE_TL() Standard_CLocaleSentry aLocaleSentry;
+ #ifndef HAVE_XLOCALE_H
+- #error System does not support xlocale. Import/export could be broken if C locale did not specified by application.
++ // #error System does not support xlocale. Import/export could be broken if C locale did not specified by application.
+ #define strtod_l(thePtr, theNextPtr, theLocale) strtod(thePtr, theNextPtr)
+ #endif
+ #define vprintf_l(theLocale, theFormat, theArgPtr) vprintf(theFormat, theArgPtr)