diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile index 5a20e566f954..a15721f8194d 100644 --- a/cad/opencascade/Makefile +++ b/cad/opencascade/Makefile @@ -77,6 +77,12 @@ DOXYGEN_RUN_DEPENDS= ${LOCALBASE}/www/MathJax/MathJax.js:www/mathjax .include +.if ${ARCH} == "i386" +BITS= 32 +.else +BITS= 64 +.endif + pre-everything:: @${ECHO_MSG} @${ECHO_MSG} "Warning: to build OpenCascade, you should have at least" diff --git a/cad/opencascade/files/patch-inc_Standard__Time.hxx b/cad/opencascade/files/patch-inc_Standard__Time.hxx new file mode 100644 index 000000000000..da5d643ee503 --- /dev/null +++ b/cad/opencascade/files/patch-inc_Standard__Time.hxx @@ -0,0 +1,19 @@ +--- inc/Standard_Time.hxx.orig 2016-11-25 09:52:28 UTC ++++ inc/Standard_Time.hxx +@@ -26,11 +26,11 @@ + // ------------------------------------------------------------------ + // IsEqual : Returns Standard_True if two time values are equal + // ------------------------------------------------------------------ +-inline Standard_Boolean IsEqual (const Standard_Time theOne, +- const Standard_Time theTwo) +-{ +- return theOne == theTwo; +-} ++//inline Standard_Boolean IsEqual (const Standard_Time theOne, ++// const Standard_Time theTwo) ++//{ ++// return theOne == theTwo; ++//} + + #endif + diff --git a/cad/opencascade/files/patch-src_Standard_Standard__Time.hxx b/cad/opencascade/files/patch-src_Standard_Standard__Time.hxx new file mode 100644 index 000000000000..5c37426134c9 --- /dev/null +++ b/cad/opencascade/files/patch-src_Standard_Standard__Time.hxx @@ -0,0 +1,19 @@ +--- src/Standard/Standard_Time.hxx.orig 2016-11-25 09:52:28 UTC ++++ src/Standard/Standard_Time.hxx +@@ -26,11 +26,11 @@ + // ------------------------------------------------------------------ + // IsEqual : Returns Standard_True if two time values are equal + // ------------------------------------------------------------------ +-inline Standard_Boolean IsEqual (const Standard_Time theOne, +- const Standard_Time theTwo) +-{ +- return theOne == theTwo; +-} ++//inline Standard_Boolean IsEqual (const Standard_Time theOne, ++// const Standard_Time theTwo) ++//{ ++// return theOne == theTwo; ++//} + + #endif + diff --git a/cad/opencascade/pkg-plist b/cad/opencascade/pkg-plist index 65cfd8cc11d9..0d72d96ef000 100644 --- a/cad/opencascade/pkg-plist +++ b/cad/opencascade/pkg-plist @@ -1,6 +1,6 @@ %%OCCROOT%%/bin/DRAWEXE %%OCCROOT%%/bin/custom.sh -%%OCCROOT%%/bin/custom_%%CC%%_64.sh +%%OCCROOT%%/bin/custom_%%CC%%_%%BITS%%.sh %%OCCROOT%%/bin/draw.sh %%OCCROOT%%/bin/env.sh %%OCCROOT%%/data/iges/bearing.iges