diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2011-07-26 20:45:15 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2011-07-26 20:45:15 +0000 |
| commit | eea970e2ad4a6b7cfb8b351a8c715f910499e6ba (patch) | |
| tree | 47cb942c2963821ed2136bb2ea93825d5a367389 /math/ros-geometry | |
| parent | - Mark BROKEN: does not link (gnutls/gcrypt) (diff) | |
Fix build with clang (third-party component bullet)
Obtained from: upstream bullet repository, revision 2222
Notes
Notes:
svn path=/head/; revision=278375
Diffstat (limited to 'math/ros-geometry')
| -rw-r--r-- | math/ros-geometry/Makefile | 5 | ||||
| -rw-r--r-- | math/ros-geometry/files/patch-bullet__build__bullet_svn__src__BulletSoftBody__btSoftBody.h | 57 |
2 files changed, 62 insertions, 0 deletions
diff --git a/math/ros-geometry/Makefile b/math/ros-geometry/Makefile index b5f841e06553..e88542f41e42 100644 --- a/math/ros-geometry/Makefile +++ b/math/ros-geometry/Makefile @@ -60,6 +60,11 @@ post-extract: ${CP} ${_DISTDIR}/eigen-3.0prebeta3.tar.bz2 ${WRKSRC}/eigen/build ${MKDIR} ${WRKSRC}/kdl/build ${CP} ${_DISTDIR}/kdl-32171.tar.gz ${WRKSRC}/kdl/build + # already extract and mark as such because we have to patch it (clang) + # fixed in bullet 2.77 + (cd ${WRKSRC}/bullet/build ; \ + ${TAR} -xf bullet-2.76-patched2.tar.gz ; \ + ${TOUCH} bullet_svn/unpacked) do-build: (cd ${WRKSRC} ; ${MAKE_ENV} ${LOCALBASE}/bin/rosmake ${MAKE_ARGS}) diff --git a/math/ros-geometry/files/patch-bullet__build__bullet_svn__src__BulletSoftBody__btSoftBody.h b/math/ros-geometry/files/patch-bullet__build__bullet_svn__src__BulletSoftBody__btSoftBody.h new file mode 100644 index 000000000000..ef62b74cc299 --- /dev/null +++ b/math/ros-geometry/files/patch-bullet__build__bullet_svn__src__BulletSoftBody__btSoftBody.h @@ -0,0 +1,57 @@ +--- bullet/build/bullet_svn/src/BulletSoftBody/btSoftBody.h.orig 2010-05-14 20:51:20.000000000 +0200 ++++ bullet/build/bullet_svn/src/BulletSoftBody/btSoftBody.h 2011-07-26 22:33:15.000000000 +0200 +@@ -182,12 +182,14 @@ + btScalar m_kAST; // Area/Angular stiffness coefficient [0,1] + btScalar m_kVST; // Volume stiffness coefficient [0,1] + int m_flags; // Flags ++ Material() : Element() {} + }; + + /* Feature */ + struct Feature : Element + { + Material* m_material; // Material ++ Feature() : Element() {} + }; + /* Node */ + struct Node : Feature +@@ -201,6 +203,7 @@ + btScalar m_area; // Area + btDbvtNode* m_leaf; // Leaf data + int m_battach:1; // Attached ++ Node() : Feature() {} + }; + /* Link */ + struct Link : Feature +@@ -212,6 +215,7 @@ + btScalar m_c1; // rl^2 + btScalar m_c2; // |gradient|^2/c0 + btVector3 m_c3; // gradient ++ Link() : Feature() {} + }; + /* Face */ + struct Face : Feature +@@ -220,6 +224,7 @@ + btVector3 m_normal; // Normal + btScalar m_ra; // Rest area + btDbvtNode* m_leaf; // Leaf data ++ Face() : Feature() {} + }; + /* Tetra */ + struct Tetra : Feature +@@ -230,6 +235,7 @@ + btVector3 m_c0[4]; // gradients + btScalar m_c1; // (4*kVST)/(im0+im1+im2+im3) + btScalar m_c2; // m_c1/sum(|g0..3|^2) ++ Tetra() : Feature() {} + }; + /* RContact */ + struct RContact +@@ -271,6 +277,7 @@ + int m_rank; // Rank + Node* m_nodes[4]; // Nodes + btScalar m_coords[4]; // Coordinates ++ Note() : Element() {} + }; + /* Pose */ + struct Pose |