Author: thierry
Date: Tue Jul 18 19:21:11 2017
New Revision: 446173
URL: https://svnweb.freebsd.org/changeset/ports/446173
Log:
Fix on i386 (no impact where on other archs).
Reported by: pointyhat
Added:
head/cad/opencascade/files/patch-inc_Standard__Time.hxx (contents, props changed)
head/cad/opencascade/files/patch-src_Standard_Standard__Time.hxx (contents, props changed)
Modified:
head/cad/opencascade/Makefile
head/cad/opencascade/pkg-plist
Modified: head/cad/opencascade/Makefile
==============================================================================
--- head/cad/opencascade/Makefile Tue Jul 18 18:52:55 2017 (r446172)
+++ head/cad/opencascade/Makefile Tue Jul 18 19:21:11 2017 (r446173)
@@ -77,6 +77,12 @@ DOXYGEN_RUN_DEPENDS= ${LOCALBASE}/www/MathJax/MathJax.
.include <bsd.port.options.mk>
+.if ${ARCH} == "i386"
+BITS= 32
+.else
+BITS= 64
+.endif
+
pre-everything::
@${ECHO_MSG}
@${ECHO_MSG} "Warning: to build OpenCascade, you should have at least"
Added: head/cad/opencascade/files/patch-inc_Standard__Time.hxx
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/cad/opencascade/files/patch-inc_Standard__Time.hxx Tue Jul 18 19:21:11 2017 (r446173)
@@ -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
+
Added: head/cad/opencascade/files/patch-src_Standard_Standard__Time.hxx
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/cad/opencascade/files/patch-src_Standard_Standard__Time.hxx Tue Jul 18 19:21:11 2017 (r446173)
@@ -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
+
Modified: head/cad/opencascade/pkg-plist
==============================================================================
--- head/cad/opencascade/pkg-plist Tue Jul 18 18:52:55 2017 (r446172)
+++ head/cad/opencascade/pkg-plist Tue Jul 18 19:21:11 2017 (r446173)
@@ -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