From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1611152-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 1EA0C158041
for <garchives@archives.gentoo.org>; Fri, 15 Mar 2024 02:45:13 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 3B773E29E0;
Fri, 15 Mar 2024 02:45:12 +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) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 13281E29E0
for <gentoo-commits@lists.gentoo.org>; Fri, 15 Mar 2024 02:45:12 +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) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id ED8EF335CAF
for <gentoo-commits@lists.gentoo.org>; Fri, 15 Mar 2024 02:45:10 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 55E3AB3F
for <gentoo-commits@lists.gentoo.org>; Fri, 15 Mar 2024 02:45:09 +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: <1710470620.138b6134d1d4aa11a85ca2004b9fe886e52f7398.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-apps/apparmor/apparmor-3.0.10.ebuild sys-apps/apparmor/apparmor-3.0.8.ebuild sys-apps/apparmor/apparmor-3.1.4.ebuild
X-VCS-Directories: sys-apps/apparmor/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 138b6134d1d4aa11a85ca2004b9fe886e52f7398
X-VCS-Branch: master
Date: Fri, 15 Mar 2024 02:45:09 +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: 6d2f1ec0-9fde-47a0-a8d8-383217787925
X-Archives-Hash: b43fea0929647c31367ea38d32d199f5
commit: 138b6134d1d4aa11a85ca2004b9fe886e52f7398
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 15 02:43:18 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 15 02:43:40 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=138b6134
sys-apps/apparmor: filter LTO
ODR violations. Seems to be worked around upstream with partitioning...
Closes: https://bugs.gentoo.org/863524
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/apparmor/apparmor-3.0.10.ebuild | 9 ++++++++-
sys-apps/apparmor/apparmor-3.0.8.ebuild | 9 ++++++++-
sys-apps/apparmor/apparmor-3.1.4.ebuild | 9 ++++++++-
3 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/sys-apps/apparmor/apparmor-3.0.10.ebuild b/sys-apps/apparmor/apparmor-3.0.10.ebuild
index 0ad9bb9bbc01..3bff9b266481 100644
--- a/sys-apps/apparmor/apparmor-3.0.10.ebuild
+++ b/sys-apps/apparmor/apparmor-3.0.10.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit systemd toolchain-funcs
+inherit flag-o-matic systemd toolchain-funcs
MY_PV="$(ver_cut 1-2)"
@@ -51,6 +51,13 @@ src_prepare() {
-i ../common/list_af_names.sh || die
}
+src_configure() {
+ # ODR violations (bug #863524)
+ filter-lto
+
+ default
+}
+
src_compile() {
emake \
AR="$(tc-getAR)" \
diff --git a/sys-apps/apparmor/apparmor-3.0.8.ebuild b/sys-apps/apparmor/apparmor-3.0.8.ebuild
index 0ad9bb9bbc01..3bff9b266481 100644
--- a/sys-apps/apparmor/apparmor-3.0.8.ebuild
+++ b/sys-apps/apparmor/apparmor-3.0.8.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit systemd toolchain-funcs
+inherit flag-o-matic systemd toolchain-funcs
MY_PV="$(ver_cut 1-2)"
@@ -51,6 +51,13 @@ src_prepare() {
-i ../common/list_af_names.sh || die
}
+src_configure() {
+ # ODR violations (bug #863524)
+ filter-lto
+
+ default
+}
+
src_compile() {
emake \
AR="$(tc-getAR)" \
diff --git a/sys-apps/apparmor/apparmor-3.1.4.ebuild b/sys-apps/apparmor/apparmor-3.1.4.ebuild
index 7e740c90b8c3..141029aefee8 100644
--- a/sys-apps/apparmor/apparmor-3.1.4.ebuild
+++ b/sys-apps/apparmor/apparmor-3.1.4.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit systemd toolchain-funcs
+inherit flag-o-matic systemd toolchain-funcs
MY_PV="$(ver_cut 1-2)"
@@ -51,6 +51,13 @@ src_prepare() {
-i ../common/list_af_names.sh || die
}
+src_configure() {
+ # ODR violations (bug #863524)
+ filter-lto
+
+ default
+}
+
src_compile() {
emake \
AR="$(tc-getAR)" \