From 5a92ca500789702b63006c70e3662c045289e2f2 Mon Sep 17 00:00:00 2001 From: Marek Szuba Date: Thu, 11 May 2023 12:03:15 +0100 Subject: dev-games/irrlicht-mt: suppress upstream optimisation/debug compiler flags Both -O3 and -g is something we leave up to the users to set or not set. Leave the setting of -mfpmath=sse on x86 be though, upstream has had a valid reason for enabling this - see https://github.com/minetest/minetest/issues/11810 . Closes: https://bugs.gentoo.org/904139 Signed-off-by: Marek Szuba --- ...irrlicht-mt-1.9.0.10-no_upstream_optflags.patch | 12 +++++++ .../irrlicht-mt/irrlicht-mt-1.9.0.10-r1.ebuild | 42 ++++++++++++++++++++++ dev-games/irrlicht-mt/irrlicht-mt-1.9.0.10.ebuild | 38 -------------------- 3 files changed, 54 insertions(+), 38 deletions(-) create mode 100644 dev-games/irrlicht-mt/files/irrlicht-mt-1.9.0.10-no_upstream_optflags.patch create mode 100644 dev-games/irrlicht-mt/irrlicht-mt-1.9.0.10-r1.ebuild delete mode 100644 dev-games/irrlicht-mt/irrlicht-mt-1.9.0.10.ebuild (limited to 'dev-games') diff --git a/dev-games/irrlicht-mt/files/irrlicht-mt-1.9.0.10-no_upstream_optflags.patch b/dev-games/irrlicht-mt/files/irrlicht-mt-1.9.0.10-no_upstream_optflags.patch new file mode 100644 index 000000000000..3fa6884d56f8 --- /dev/null +++ b/dev-games/irrlicht-mt/files/irrlicht-mt-1.9.0.10-no_upstream_optflags.patch @@ -0,0 +1,12 @@ +--- a/source/Irrlicht/CMakeLists.txt ++++ b/source/Irrlicht/CMakeLists.txt +@@ -14,9 +14,6 @@ + set(CMAKE_CXX_STANDARD_REQUIRED ON) + + if(CMAKE_CXX_COMPILER_ID MATCHES "^(GNU|Clang|AppleClang)$") +- set(CMAKE_CXX_FLAGS_RELEASE "-O3") +- set(CMAKE_CXX_FLAGS_DEBUG "-g") +- + add_compile_options(-Wall -pipe -fno-exceptions -fno-rtti) + + # Enable SSE for floating point math on 32-bit x86 by default diff --git a/dev-games/irrlicht-mt/irrlicht-mt-1.9.0.10-r1.ebuild b/dev-games/irrlicht-mt/irrlicht-mt-1.9.0.10-r1.ebuild new file mode 100644 index 000000000000..aabef13c265f --- /dev/null +++ b/dev-games/irrlicht-mt/irrlicht-mt-1.9.0.10-r1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +MY_PN="${PN%-mt}" +MY_PV="$(ver_rs 3 'mt')" +MY_P="${MY_PN}-${MY_PV}" + +DESCRIPTION="Minetest's fork of dev-games/irrlicht" +HOMEPAGE="https://github.com/minetest/irrlicht" +SRC_URI="https://github.com/minetest/${MY_PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="ZLIB" +SLOT="0" +KEYWORDS="~amd64 ~riscv" + +RDEPEND="~dev-games/irrlicht-mt-headers-${PV} + media-libs/libpng:0= + sys-libs/zlib + media-libs/libjpeg-turbo + virtual/opengl + x11-libs/libX11 + x11-libs/libXi + x11-libs/libXxf86vm" +DEPEND="${RDEPEND} + x11-base/xorg-proto" + +PATCHES=( + "${FILESDIR}"/${PN}-1.9.0.10-no_upstream_optflags.patch +) + +S="${WORKDIR}"/${MY_P} + +src_install() { + cmake_src_install + + # We package these separately + rm -r "${ED}"/usr/include/${PN/-/} || die "Failed to exclude header files from installation" +} diff --git a/dev-games/irrlicht-mt/irrlicht-mt-1.9.0.10.ebuild b/dev-games/irrlicht-mt/irrlicht-mt-1.9.0.10.ebuild deleted file mode 100644 index 9e3cff77d488..000000000000 --- a/dev-games/irrlicht-mt/irrlicht-mt-1.9.0.10.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -MY_PN="${PN%-mt}" -MY_PV="$(ver_rs 3 'mt')" -MY_P="${MY_PN}-${MY_PV}" - -DESCRIPTION="Minetest's fork of dev-games/irrlicht" -HOMEPAGE="https://github.com/minetest/irrlicht" -SRC_URI="https://github.com/minetest/${MY_PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="~amd64 ~riscv" - -RDEPEND="~dev-games/irrlicht-mt-headers-${PV} - media-libs/libpng:0= - sys-libs/zlib - media-libs/libjpeg-turbo - virtual/opengl - x11-libs/libX11 - x11-libs/libXi - x11-libs/libXxf86vm" -DEPEND="${RDEPEND} - x11-base/xorg-proto" - -S="${WORKDIR}"/${MY_P} - -src_install() { - cmake_src_install - - # We package these separately - rm -r "${ED}"/usr/include/${PN/-/} || die "Failed to exclude header files from installation" -} -- cgit v1.2.3-65-gdbad