From 1a977dcf401649337dccdb59bcefde5f2e57109d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Bar=C4=87?= Date: Fri, 22 Oct 2021 00:58:05 +0200 Subject: [PATCH] dev-lang/lean: fix build type and flags MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Maciej Barć --- dev-lang/lean/files/fix_flags.patch | 23 +++++++++++++++++++++++ dev-lang/lean/lean-3.33.0.ebuild | 13 +++++++++++-- dev-lang/lean/lean-3.34.0.ebuild | 13 +++++++++++-- 3 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 dev-lang/lean/files/fix_flags.patch diff --git a/dev-lang/lean/files/fix_flags.patch b/dev-lang/lean/files/fix_flags.patch new file mode 100644 index 0000000000..1fd788fd79 --- /dev/null +++ b/dev-lang/lean/files/fix_flags.patch @@ -0,0 +1,23 @@ +index f0efdf425..4cd461986 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -194,7 +194,7 @@ set(CMAKE_CXX_FLAGS_DEBUG "-DLEAN_DEBUG -DLEAN_TRACE") + set(CMAKE_CXX_FLAGS_MINSIZEREL "-DNDEBUG") + set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG") + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-DLEAN_DEBUG") +-set(CMAKE_CXX_FLAGS_GPROF "-O2 -g -pg") ++set(CMAKE_CXX_FLAGS_GPROF "-g -pg") + + # OSX .dmg generation (this is working in progress) + set(CPACK_DMG_BACKGROUND_IMAGE "${LEAN_SOURCE_DIR}/../images/lean.png") +@@ -264,8 +264,8 @@ if (NOT MSVC) + set(CMAKE_CXX_FLAGS "-Wall -Wextra -std=c++11 ${CMAKE_CXX_FLAGS}") + set(CMAKE_CXX_FLAGS_DEBUG "-g3 ${CMAKE_CXX_FLAGS_DEBUG}") + set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os ${CMAKE_CXX_FLAGS_MINSIZEREL}") +- set(CMAKE_CXX_FLAGS_RELEASE "-O3 ${CMAKE_CXX_FLAGS_RELEASE}") +- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g3 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}") ++ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}") ++ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g3 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}") + elseif (MULTI_THREAD) + set(CMAKE_CXX_FLAGS_DEBUG "/MTd ${CMAKE_CXX_FLAGS_DEBUG}") + set(CMAKE_CXX_FLAGS_MINSIZEREL "/MT ${CMAKE_CXX_FLAGS_MINSIZEREL}") diff --git a/dev-lang/lean/lean-3.33.0.ebuild b/dev-lang/lean/lean-3.33.0.ebuild index 95b6a56553..3ab4b15f4d 100644 --- a/dev-lang/lean/lean-3.33.0.ebuild +++ b/dev-lang/lean/lean-3.33.0.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 CMAKE_IN_SOURCE_BUILD="ON" @@ -23,12 +23,21 @@ S="${WORKDIR}/lean-${PV}/src" LICENSE="Apache-2.0" SLOT="0/${MAJOR}" -IUSE="+json +threads" +IUSE="debug +json +threads" RDEPEND="dev-libs/gmp" DEPEND="${RDEPEND}" +PATCHES=( "${FILESDIR}/fix_flags.patch" ) + src_configure() { + local CMAKE_BUILD_TYPE + if use debug; then + CMAKE_BUILD_TYPE="Debug" + else + CMAKE_BUILD_TYPE="Release" + fi + local mycmakeargs=( -DALPHA=ON -DAUTO_THREAD_FINALIZATION=ON diff --git a/dev-lang/lean/lean-3.34.0.ebuild b/dev-lang/lean/lean-3.34.0.ebuild index 95b6a56553..3ab4b15f4d 100644 --- a/dev-lang/lean/lean-3.34.0.ebuild +++ b/dev-lang/lean/lean-3.34.0.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 CMAKE_IN_SOURCE_BUILD="ON" @@ -23,12 +23,21 @@ S="${WORKDIR}/lean-${PV}/src" LICENSE="Apache-2.0" SLOT="0/${MAJOR}" -IUSE="+json +threads" +IUSE="debug +json +threads" RDEPEND="dev-libs/gmp" DEPEND="${RDEPEND}" +PATCHES=( "${FILESDIR}/fix_flags.patch" ) + src_configure() { + local CMAKE_BUILD_TYPE + if use debug; then + CMAKE_BUILD_TYPE="Debug" + else + CMAKE_BUILD_TYPE="Release" + fi + local mycmakeargs=( -DALPHA=ON -DAUTO_THREAD_FINALIZATION=ON