Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/sdformat/
Date: Sun, 27 Feb 2022 10:32:57
Message-Id: 1645957966.3d21f57ec261288666ae8f1b6c4dfb5256e2edbc.soap@gentoo
1 commit: 3d21f57ec261288666ae8f1b6c4dfb5256e2edbc
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 27 10:32:46 2022 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 27 10:32:46 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d21f57e
7
8 dev-libs/sdformat: [QA] port to cmake.eclass
9
10 Bug: https://bugs.gentoo.org/811951
11 Signed-off-by: David Seifert <soap <AT> gentoo.org>
12
13 dev-libs/sdformat/sdformat-9.7.0.ebuild | 23 +++++++++++++----------
14 1 file changed, 13 insertions(+), 10 deletions(-)
15
16 diff --git a/dev-libs/sdformat/sdformat-9.7.0.ebuild b/dev-libs/sdformat/sdformat-9.7.0.ebuild
17 index 7e9289e7fc28..4a78444096c6 100644
18 --- a/dev-libs/sdformat/sdformat-9.7.0.ebuild
19 +++ b/dev-libs/sdformat/sdformat-9.7.0.ebuild
20 @@ -1,9 +1,9 @@
21 -# Copyright 1999-2021 Gentoo Authors
22 +# Copyright 1999-2022 Gentoo Authors
23 # Distributed under the terms of the GNU General Public License v2
24
25 -EAPI=7
26 +EAPI=8
27
28 -inherit cmake-utils
29 +inherit cmake
30
31 DESCRIPTION="Simulation Description Format (SDF) parser"
32 HOMEPAGE="http://sdformat.org/"
33 @@ -13,7 +13,6 @@ LICENSE="Apache-2.0"
34 # subslot = libsdformat major
35 SLOT="0/9"
36 KEYWORDS="~amd64"
37 -IUSE=""
38
39 RDEPEND="
40 >=dev-libs/urdfdom-1:=
41 @@ -26,14 +25,18 @@ BDEPEND="
42 dev-lang/ruby:*
43 virtual/pkgconfig
44 "
45 -CMAKE_BUILD_TYPE=RelWithDebInfo
46 +
47 +src_prepare() {
48 + cmake_src_prepare
49 +
50 + # get rid of default flags
51 + sed -i -e '/_FLAGS_RELWITHDEBINFO/d' cmake/DefaultCFlags.cmake || die
52 +}
53
54 src_configure() {
55 - echo "set (CMAKE_C_FLAGS_ALL \"${CXXFLAGS} \${CMAKE_C_FLAGS_ALL}\")" > "${S}/cmake/HostCFlags.cmake"
56 - sed -i -e "s/LINK_FLAGS_RELWITHDEBINFO \" \"/LINK_FLAGS_RELWITHDEBINFO \" ${LDFLAGS} \"/" cmake/DefaultCFlags.cmake || die
57 local mycmakeargs=(
58 - "-DUSE_INTERNAL_URDF=OFF"
59 - "-DUSE_EXTERNAL_TINYXML=ON"
60 + -DUSE_INTERNAL_URDF=OFF
61 + -DUSE_EXTERNAL_TINYXML=ON
62 )
63 - cmake-utils_src_configure
64 + cmake_src_configure
65 }