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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9E2AD158094 for ; Wed, 7 Sep 2022 09:08:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AFDC3E0ADC; Wed, 7 Sep 2022 09:08:13 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6D73CE0ADC for ; Wed, 7 Sep 2022 09:08:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 73BE7340F9A for ; Wed, 7 Sep 2022 09:08:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0189E5C7 for ; Wed, 7 Sep 2022 09:08:11 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1662541682.44c4388090c24c1878564cbb29f735f5c126ce81.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-action/minetest/files/, games-action/minetest/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-action/minetest/files/minetest-5.6.0-no_upstream_optflags.patch games-action/minetest/minetest-5.6.0-r1.ebuild games-action/minetest/minetest-5.6.0.ebuild X-VCS-Directories: games-action/minetest/files/ games-action/minetest/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: 44c4388090c24c1878564cbb29f735f5c126ce81 X-VCS-Branch: master Date: Wed, 7 Sep 2022 09:08:11 +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: e605c466-26aa-4e8c-ae85-429166d9d91b X-Archives-Hash: df3f159b8381f66918af81aeb6e7bedf commit: 44c4388090c24c1878564cbb29f735f5c126ce81 Author: Marek Szuba gentoo org> AuthorDate: Wed Sep 7 09:04:53 2022 +0000 Commit: Marek Szuba gentoo org> CommitDate: Wed Sep 7 09:08:02 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44c43880 games-action/minetest: suppress upstream optimisation flags Upstream build scripts add -O3 -funroll-loops -fomit-frame-pointers to CXXFLAGS, and since they are appended rather than prepended they may override optimisation flags set by the user. Closes: https://bugs.gentoo.org/868540 Signed-off-by: Marek Szuba gentoo.org> .../files/minetest-5.6.0-no_upstream_optflags.patch | 15 +++++++++++++++ .../{minetest-5.6.0.ebuild => minetest-5.6.0-r1.ebuild} | 2 ++ 2 files changed, 17 insertions(+) diff --git a/games-action/minetest/files/minetest-5.6.0-no_upstream_optflags.patch b/games-action/minetest/files/minetest-5.6.0-no_upstream_optflags.patch new file mode 100644 index 000000000000..68d71679924b --- /dev/null +++ b/games-action/minetest/files/minetest-5.6.0-no_upstream_optflags.patch @@ -0,0 +1,15 @@ +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -756,11 +756,10 @@ + endif() + endif() + +- set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${OTHER_FLAGS} -pipe -funroll-loops") ++ set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${OTHER_FLAGS}") + if(CMAKE_SYSTEM_NAME MATCHES "(Darwin|BSD|DragonFly)") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Os") + else() +- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -fomit-frame-pointer") + if(CMAKE_SYSTEM_NAME STREQUAL "Linux" + AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang" + AND CMAKE_CXX_COMPILER_VERSION MATCHES "^9\\.") diff --git a/games-action/minetest/minetest-5.6.0.ebuild b/games-action/minetest/minetest-5.6.0-r1.ebuild similarity index 97% rename from games-action/minetest/minetest-5.6.0.ebuild rename to games-action/minetest/minetest-5.6.0-r1.ebuild index 586774932b7f..6d626a4d0046 100644 --- a/games-action/minetest/minetest-5.6.0.ebuild +++ b/games-action/minetest/minetest-5.6.0-r1.ebuild @@ -3,6 +3,7 @@ EAPI=8 +CMAKE_BUILD_TYPE="Release" LUA_COMPAT=( lua5-1 luajit ) inherit cmake flag-o-matic lua-single systemd xdg @@ -64,6 +65,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-5.4.1-system_puc_lua.patch + "${FILESDIR}"/${PN}-5.6.0-no_upstream_optflags.patch ) src_prepare() {