Date: Mon, 13 Jan 2014 03:19:36 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/185716: graphics/dynamechs: Fix build with clang Message-ID: <20140113031936.253d3f73af0456a1ff9aab2a@yahoo.com> Resent-Message-ID: <201401121840.s0CIeABO049551@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 185716
>Category: ports
>Synopsis: graphics/dynamechs: Fix build with clang
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Jan 12 18:40:10 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 8.4-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Fix build with clang
New file:
files/patch-aquarobot__MatrixMy.cpp
files/patch-dm__svd_linpack.cpp
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/graphics/dynamechs/Makefile graphics/dynamechs/Makefile
--- /usr/ports/graphics/dynamechs/Makefile 2013-11-06 22:02:18.000000000 +0900
+++ graphics/dynamechs/Makefile 2014-01-13 00:00:00.000000000 +0900
@@ -10,32 +10,32 @@
DISTNAME= ${PORTNAME}_${PORTVERSION:S/.p/pre/}
MAINTAINER= ports@FreeBSD.org
-COMMENT= A Multibody Dynamic Simulation Library
+COMMENT= Multibody Dynamic Simulation Library
-USES= perl5
USE_BZIP2= yes
+USES= gmake perl5
USE_GL= glut
-USE_GMAKE= yes
USE_PERL5= build
-CXXFLAGS+= ${PTHREAD_CFLAGS}
MAKE_ENV= OPENGLINCDIR="${LOCALBASE}/include" \
OPENGLLIBDIR="${LOCALBASE}/lib"
-LDFLAGS+= ${PTHREAD_LIBS}
ALL_TARGET= freebsd
USE_LDCONFIG= yes
-NO_STAGE= yes
-.include <bsd.port.pre.mk>
+post-patch:
+ @${REINPLACE_CMD} -e \
+ 's|.SILENT:||' ${WRKSRC}/Makefile
do-configure:
@${CP} -f ${FILESDIR}/make.platform.freebsd ${WRKSRC}/make/
do-install:
.for dir in dm dmu dmGL
- ${RM} -f ${WRKSRC}/${dir}/*.orig
- @${MKDIR} ${PREFIX}/include/${PORTNAME}/${dir}
- ${INSTALL_DATA} ${WRKSRC}/${dir}/*.h* ${PREFIX}/include/${PORTNAME}/${dir}
- ${INSTALL_DATA} ${WRKSRC}/lib/platform.freebsd/lib${dir}.so ${PREFIX}/lib
+ @${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME}/${dir}
+ (cd ${WRKSRC}/${dir} && ${FIND} . -name "*.h" -or -name "*.hpp" | \
+ ${XARGS} -J % ${INSTALL_DATA} % \
+ ${STAGEDIR}${PREFIX}/include/${PORTNAME}/${dir})
+ (cd ${WRKSRC}/lib/platform.freebsd && ${INSTALL_LIB} lib${dir}.so \
+ ${STAGEDIR}${PREFIX}/lib)
.endfor
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN /usr/ports/graphics/dynamechs/files/make.platform.freebsd graphics/dynamechs/files/make.platform.freebsd
--- /usr/ports/graphics/dynamechs/files/make.platform.freebsd 2013-11-06 22:02:18.000000000 +0900
+++ graphics/dynamechs/files/make.platform.freebsd 2014-01-13 00:00:00.000000000 +0900
@@ -2,7 +2,7 @@
# -pthreads
DEPENDFLAGS := $(CXXFLAGS)
-LDFLAGS += -fPIC -L/$(OPENGLLIBDIR) -L${LOCALBASE}/lib -lX11 -lm -l$(MESA)GLU -l$(MESA)GL
+LDFLAGS += -pthread -fPIC -L/$(OPENGLLIBDIR) -L${LOCALBASE}/lib -lX11 -lm -l$(MESA)GLU -l$(MESA)GL
LDGLUT := -lglut
# CXX := c++
diff -urN /usr/ports/graphics/dynamechs/files/patch-aquarobot::Gait.hpp graphics/dynamechs/files/patch-aquarobot::Gait.hpp
--- /usr/ports/graphics/dynamechs/files/patch-aquarobot::Gait.hpp 2013-11-06 22:02:18.000000000 +0900
+++ graphics/dynamechs/files/patch-aquarobot::Gait.hpp 2014-01-13 00:00:00.000000000 +0900
@@ -1,15 +1,28 @@
---- aquarobot/Gait.hpp.orig Thu Jul 19 08:40:44 2001
-+++ aquarobot/Gait.hpp Sat Dec 21 08:57:01 2002
-@@ -26,10 +26,11 @@
+--- aquarobot/Gait.hpp.orig 2001-07-19 08:40:44.000000000 +0900
++++ aquarobot/Gait.hpp 2014-01-08 21:46:35.000000000 +0900
+@@ -26,24 +26,17 @@
#include <windows.h>
#endif
-#if defined(WIN32) || (defined(sgi) && defined(_STANDARD_C_PLUS_PLUS)) || (defined(__GNUC__) && (__GNUC__>=2) && (__GNUC_MINOR__>=91))
-+#if defined(WIN32) || (defined(sgi) && defined(_STANDARD_C_PLUS_PLUS)) || (defined(__GNUC__) && (__GNUC__>=2) && (__GNUC_MINOR__>=91)) || (defined(__GNUC__) && (__GNUC__>=3))
#include <iostream>
#include <iomanip>
#include <fstream>
+-#else
+-#include <iostream.h>
+-#include <iomanip.h>
+-#include <fstream.h>
+-#endif
+using namespace std;
- #else
- #include <iostream.h>
- #include <iomanip.h>
+
+ #include <math.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+
+ // Use the std namespace. To do this we must first guarantee that it exists.
+-#if defined(__sgi) || defined(__WIN32_) || defined(WIN32)
+ namespace std {}
+ using namespace std;
+-#endif
+
+ #endif
diff -urN /usr/ports/graphics/dynamechs/files/patch-aquarobot__MatrixMy.cpp graphics/dynamechs/files/patch-aquarobot__MatrixMy.cpp
--- /usr/ports/graphics/dynamechs/files/patch-aquarobot__MatrixMy.cpp 1970-01-01 09:00:00.000000000 +0900
+++ graphics/dynamechs/files/patch-aquarobot__MatrixMy.cpp 2014-01-13 00:00:00.000000000 +0900
@@ -0,0 +1,11 @@
+--- aquarobot/MatrixMy.cpp.orig
++++ aquarobot/MatrixMy.cpp
+@@ -38,7 +38,7 @@
+ // Constructor
+ // **************************************************************************
+ //MatrixMy::MatrixMy(int r = 4, int c = 4)
+-MatrixMy::MatrixMy(int r = 3, int c = 3)
++MatrixMy::MatrixMy(int r, int c)
+ {
+ row = r;
+ column = c;
diff -urN /usr/ports/graphics/dynamechs/files/patch-dm__svd_linpack.cpp graphics/dynamechs/files/patch-dm__svd_linpack.cpp
--- /usr/ports/graphics/dynamechs/files/patch-dm__svd_linpack.cpp 1970-01-01 09:00:00.000000000 +0900
+++ graphics/dynamechs/files/patch-dm__svd_linpack.cpp 2014-01-13 00:00:00.000000000 +0900
@@ -0,0 +1,13 @@
+--- dm/svd_linpack.cpp.orig
++++ dm/svd_linpack.cpp
+@@ -10,7 +10,9 @@
+ #endif
+
+ #include <stdio.h>
+-#include <iomanip.h>
++#include <iostream>
++#include <iomanip>
++using namespace std;
+
+ #ifdef __cplusplus
+ extern "C" {
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140113031936.253d3f73af0456a1ff9aab2a>