From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 04612158088 for ; Fri, 8 Oct 2021 19:05:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 41559E083E; Fri, 8 Oct 2021 19:05:19 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B1498E0843 for ; Fri, 8 Oct 2021 19:05:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B81F0342BEC for ; Fri, 8 Oct 2021 19:05:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 54967156 for ; Fri, 8 Oct 2021 19:05:14 +0000 (UTC) From: "Arthur Zamarin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arthur Zamarin" Message-ID: <1633647208.d73e4916a6587e1d6c12c1c763eca12c6b6d1b54.arthurzam@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: sci-physics/mbdyn/files/, sci-physics/mbdyn/ X-VCS-Repository: repo/proj/guru X-VCS-Files: sci-physics/mbdyn/files/mbdyn-find-bullet.patch sci-physics/mbdyn/mbdyn-1.7.3_p20210925.ebuild X-VCS-Directories: sci-physics/mbdyn/files/ sci-physics/mbdyn/ X-VCS-Committer: arthurzam X-VCS-Committer-Name: Arthur Zamarin X-VCS-Revision: d73e4916a6587e1d6c12c1c763eca12c6b6d1b54 X-VCS-Branch: master Date: Fri, 8 Oct 2021 19:05:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 580930e3-0963-44ec-977d-1a289c20a378 X-Archives-Hash: f3ffb18659544d39396e103b5b242119 commit: d73e4916a6587e1d6c12c1c763eca12c6b6d1b54 Author: Alessandro Barbieri gmail com> AuthorDate: Thu Oct 7 22:52:56 2021 +0000 Commit: Arthur Zamarin gentoo org> CommitDate: Thu Oct 7 22:53:28 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d73e4916 sci-physics/mbdyn: fix bullet detection Signed-off-by: Alessandro Barbieri gmail.com> sci-physics/mbdyn/files/mbdyn-find-bullet.patch | 22 ++++++++++++++++++++++ sci-physics/mbdyn/mbdyn-1.7.3_p20210925.ebuild | 5 +++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/sci-physics/mbdyn/files/mbdyn-find-bullet.patch b/sci-physics/mbdyn/files/mbdyn-find-bullet.patch new file mode 100644 index 000000000..129976181 --- /dev/null +++ b/sci-physics/mbdyn/files/mbdyn-find-bullet.patch @@ -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 + diff --git a/sci-physics/mbdyn/mbdyn-1.7.3_p20210925.ebuild b/sci-physics/mbdyn/mbdyn-1.7.3_p20210925.ebuild index 6fecb6acb..5a7971737 100644 --- a/sci-physics/mbdyn/mbdyn-1.7.3_p20210925.ebuild +++ b/sci-physics/mbdyn/mbdyn-1.7.3_p20210925.ebuild @@ -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