From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1612282-garchives=archives.gentoo.org@lists.gentoo.org>
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 6F2CE158041
for <garchives@archives.gentoo.org>; Mon, 18 Mar 2024 07:20:44 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 35289E29B7;
Mon, 18 Mar 2024 07:20:43 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(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 1FC0CE29B7
for <gentoo-commits@lists.gentoo.org>; Mon, 18 Mar 2024 07:20:43 +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 66D89341214
for <gentoo-commits@lists.gentoo.org>; Mon, 18 Mar 2024 07:20:42 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 7B95C1559
for <gentoo-commits@lists.gentoo.org>; Mon, 18 Mar 2024 07:20:39 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1710746420.b7da321dd9f1964ad1f3534fb09edbce0fd0d397.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-libs/x265/x265-3.5-r3.ebuild media-libs/x265/x265-9999.ebuild
X-VCS-Directories: media-libs/x265/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: b7da321dd9f1964ad1f3534fb09edbce0fd0d397
X-VCS-Branch: master
Date: Mon, 18 Mar 2024 07:20:39 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: d616aec8-bb35-420b-b0bf-e632ed6648d8
X-Archives-Hash: 5ceb69efcf73895bb81908899acd06aa
commit: b7da321dd9f1964ad1f3534fb09edbce0fd0d397
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Mon Mar 18 06:14:59 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 18 07:20:20 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7da321d
media-libs/x265: mark as LTO-unsafe
Closes: https://bugs.gentoo.org/875854
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/x265/x265-3.5-r3.ebuild | 9 +++++++--
media-libs/x265/x265-9999.ebuild | 9 +++++++--
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/media-libs/x265/x265-3.5-r3.ebuild b/media-libs/x265/x265-3.5-r3.ebuild
index 83e490d78ecf..f3d6c8cbd76a 100644
--- a/media-libs/x265/x265-3.5-r3.ebuild
+++ b/media-libs/x265/x265-3.5-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit cmake multilib-minimal multibuild
+inherit cmake flag-o-matic multilib-minimal multibuild
if [[ ${PV} = 9999* ]]; then
inherit git-r3
@@ -157,6 +157,11 @@ x265_variant_src_configure() {
}
multilib_src_configure() {
+ # -Werror=odr
+ # https://bugs.gentoo.org/875854
+ # https://bitbucket.org/multicoreware/x265_git/issues/937/build-fails-with-lto
+ filter-lto
+
local myabicmakeargs=(
-DENABLE_TESTS=$(usex test ON OFF)
$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 7503475200d5..8fb553c069a6 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit cmake multilib-minimal multibuild
+inherit cmake flag-o-matic multilib-minimal multibuild
if [[ ${PV} = 9999* ]]; then
inherit git-r3
@@ -156,6 +156,11 @@ x265_variant_src_configure() {
}
multilib_src_configure() {
+ # -Werror=odr
+ # https://bugs.gentoo.org/875854
+ # https://bitbucket.org/multicoreware/x265_git/issues/937/build-fails-with-lto
+ filter-lto
+
local myabicmakeargs=(
-DENABLE_TESTS=$(usex test ON OFF)
$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")