| 1 |
commit: d73e4916a6587e1d6c12c1c763eca12c6b6d1b54 |
| 2 |
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Oct 7 22:52:56 2021 +0000 |
| 4 |
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 7 22:53:28 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d73e4916 |
| 7 |
|
| 8 |
sci-physics/mbdyn: fix bullet detection |
| 9 |
|
| 10 |
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> |
| 11 |
|
| 12 |
sci-physics/mbdyn/files/mbdyn-find-bullet.patch | 22 ++++++++++++++++++++++ |
| 13 |
sci-physics/mbdyn/mbdyn-1.7.3_p20210925.ebuild | 5 +++-- |
| 14 |
2 files changed, 25 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sci-physics/mbdyn/files/mbdyn-find-bullet.patch b/sci-physics/mbdyn/files/mbdyn-find-bullet.patch |
| 17 |
new file mode 100644 |
| 18 |
index 000000000..129976181 |
| 19 |
--- /dev/null |
| 20 |
+++ b/sci-physics/mbdyn/files/mbdyn-find-bullet.patch |
| 21 |
@@ -0,0 +1,22 @@ |
| 22 |
+--- a/configure.ac |
| 23 |
++++ b/configure.ac |
| 24 |
+@@ -1889,15 +1889,15 @@ |
| 25 |
+ if test "$ol_with_bullet" != "no" ; then |
| 26 |
+ AC_LANG_CPLUSPLUS |
| 27 |
+ have_libbullet=no |
| 28 |
+- AC_CHECK_HEADER(BulletCollision/CollisionShapes/btCollisionShape.h,[have_bullet_h=yes],[have_bullet_h=no]) |
| 29 |
++ AC_CHECK_HEADER(bullet/BulletCollision/CollisionShapes/btCollisionShape.h,[have_bullet_h=yes],[have_bullet_h=no]) |
| 30 |
+ if test "$have_bullet_h" = "yes" ; then |
| 31 |
+ SAVE_LIBS="$LIBS" |
| 32 |
+- try_BULLET_LIBS="-lbulletcollision -lbulletmath" |
| 33 |
++ try_BULLET_LIBS="-lBulletCollision" |
| 34 |
+ LIBS="$try_BULLET_LIBS $LIBS" |
| 35 |
+- AC_CHECK_LIB(bulletcollision,btBulletCollisionProbe,[ |
| 36 |
++ AC_CHECK_LIB(BulletCollision,btBulletCollisionProbe,[ |
| 37 |
+ have_libbullet=yes |
| 38 |
+ BULLET_LIBS="$try_BULLET_LIBS" |
| 39 |
+- ],[have_libbullet=no],[-lbulletmath]) |
| 40 |
++ ],[have_libbullet=no],[]) |
| 41 |
+ LIBS="$save_LIBS" |
| 42 |
+ fi |
| 43 |
+ |
| 44 |
|
| 45 |
diff --git a/sci-physics/mbdyn/mbdyn-1.7.3_p20210925.ebuild b/sci-physics/mbdyn/mbdyn-1.7.3_p20210925.ebuild |
| 46 |
index 6fecb6acb..5a7971737 100644 |
| 47 |
--- a/sci-physics/mbdyn/mbdyn-1.7.3_p20210925.ebuild |
| 48 |
+++ b/sci-physics/mbdyn/mbdyn-1.7.3_p20210925.ebuild |
| 49 |
@@ -7,7 +7,7 @@ COMMIT="ae57618c4e7b030b59707b8c156a6e2a94a6efd0" |
| 50 |
MYP="${PN}-${COMMIT}" |
| 51 |
PYTHON_COMPAT=( python3_{8..10} ) |
| 52 |
|
| 53 |
-inherit autotools fortran-2 pam python-single-r1 |
| 54 |
+inherit autotools flag-o-matic fortran-2 pam python-single-r1 |
| 55 |
|
| 56 |
DESCRIPTION="A general purpose Multibody Dynamics analysis software" |
| 57 |
HOMEPAGE="https://www.mbdyn.org" |
| 58 |
@@ -138,6 +138,7 @@ DEPEND=" |
| 59 |
BDEPEND="python? ( dev-lang/swig )" |
| 60 |
|
| 61 |
PATCHES=( |
| 62 |
+ "${FILESDIR}/${PN}-find-bullet.patch" |
| 63 |
"${FILESDIR}/${PN}-octave-no-global-install.patch" |
| 64 |
) |
| 65 |
# "${FILESDIR}/${PN}-respect-libtool.patch" |
| 66 |
@@ -176,7 +177,7 @@ src_prepare() { |
| 67 |
|
| 68 |
src_configure() { |
| 69 |
python_setup |
| 70 |
-# append-cxxflags "-I/usr/include/openmpi/ompi/mpi/cxx/" |
| 71 |
+ append-cxxflags "-I/usr/include/bullet" |
| 72 |
local myconf=( |
| 73 |
--disable-static |
| 74 |
--disable-Werror |
Archives