sci-physics/mbdyn: fix bullet detection

Signed-off-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>
This commit is contained in:
Alessandro Barbieri
2021-10-08 00:52:56 +02:00
parent 373d64e26d
commit d73e4916a6
2 changed files with 25 additions and 2 deletions

View File

@@ -0,0 +1,22 @@
--- a/configure.ac
+++ b/configure.ac
@@ -1889,15 +1889,15 @@
if test "$ol_with_bullet" != "no" ; then
AC_LANG_CPLUSPLUS
have_libbullet=no
- AC_CHECK_HEADER(BulletCollision/CollisionShapes/btCollisionShape.h,[have_bullet_h=yes],[have_bullet_h=no])
+ AC_CHECK_HEADER(bullet/BulletCollision/CollisionShapes/btCollisionShape.h,[have_bullet_h=yes],[have_bullet_h=no])
if test "$have_bullet_h" = "yes" ; then
SAVE_LIBS="$LIBS"
- try_BULLET_LIBS="-lbulletcollision -lbulletmath"
+ try_BULLET_LIBS="-lBulletCollision"
LIBS="$try_BULLET_LIBS $LIBS"
- AC_CHECK_LIB(bulletcollision,btBulletCollisionProbe,[
+ AC_CHECK_LIB(BulletCollision,btBulletCollisionProbe,[
have_libbullet=yes
BULLET_LIBS="$try_BULLET_LIBS"
- ],[have_libbullet=no],[-lbulletmath])
+ ],[have_libbullet=no],[])
LIBS="$save_LIBS"
fi

View File

@@ -7,7 +7,7 @@ COMMIT="ae57618c4e7b030b59707b8c156a6e2a94a6efd0"
MYP="${PN}-${COMMIT}"
PYTHON_COMPAT=( python3_{8..10} )
inherit autotools fortran-2 pam python-single-r1
inherit autotools flag-o-matic fortran-2 pam python-single-r1
DESCRIPTION="A general purpose Multibody Dynamics analysis software"
HOMEPAGE="https://www.mbdyn.org"
@@ -138,6 +138,7 @@ DEPEND="
BDEPEND="python? ( dev-lang/swig )"
PATCHES=(
"${FILESDIR}/${PN}-find-bullet.patch"
"${FILESDIR}/${PN}-octave-no-global-install.patch"
)
# "${FILESDIR}/${PN}-respect-libtool.patch"
@@ -176,7 +177,7 @@ src_prepare() {
src_configure() {
python_setup
# append-cxxflags "-I/usr/include/openmpi/ompi/mpi/cxx/"
append-cxxflags "-I/usr/include/bullet"
local myconf=(
--disable-static
--disable-Werror