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 CCE77158041 for ; Thu, 14 Mar 2024 00:30:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 09EC0E29B9; Thu, 14 Mar 2024 00:30:38 +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 DAF79E29B9 for ; Thu, 14 Mar 2024 00:30:37 +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 C28A833BDFF for ; Thu, 14 Mar 2024 00:30:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2643AB29 for ; Thu, 14 Mar 2024 00:30:35 +0000 (UTC) From: "Sam James" 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" Message-ID: <1710376195.f199ce7fe94e1d86fe9b9de709cfd5fcba31f009.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/graphite2/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/graphite2/graphite2-1.3.14_p20210810-r3.ebuild X-VCS-Directories: media-gfx/graphite2/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: f199ce7fe94e1d86fe9b9de709cfd5fcba31f009 X-VCS-Branch: master Date: Thu, 14 Mar 2024 00:30:35 +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: 88ae1254-a7bb-4bec-ba0a-2aad6b8813de X-Archives-Hash: 1592fc41b8f0ddd04bbb3aa7675134b3 commit: f199ce7fe94e1d86fe9b9de709cfd5fcba31f009 Author: Sam James gentoo org> AuthorDate: Thu Mar 14 00:29:55 2024 +0000 Commit: Sam James gentoo org> CommitDate: Thu Mar 14 00:29:55 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f199ce7f media-gfx/graphite2: filter LTO ODR violations. Also, previous attempts to upstream issues like e.g. linking with libstdc++ didn't go well. Closes: https://bugs.gentoo.org/875224 Signed-off-by: Sam James gentoo.org> media-gfx/graphite2/graphite2-1.3.14_p20210810-r3.ebuild | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/media-gfx/graphite2/graphite2-1.3.14_p20210810-r3.ebuild b/media-gfx/graphite2/graphite2-1.3.14_p20210810-r3.ebuild index a2d978097e08..580df138e20e 100644 --- a/media-gfx/graphite2/graphite2-1.3.14_p20210810-r3.ebuild +++ b/media-gfx/graphite2/graphite2-1.3.14_p20210810-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,7 +6,7 @@ EAPI=8 COMMIT=80c52493ef42e6fe605a69dcddd2a691cd8a1380 GENTOO_DEPEND_ON_PERL="no" PYTHON_COMPAT=( python3_{9..11} ) -inherit perl-module python-any-r1 cmake-multilib +inherit flag-o-matic perl-module python-any-r1 cmake-multilib DESCRIPTION="Library providing rendering capabilities for complex non-Roman writing systems" HOMEPAGE="https://scripts.sil.org/cms/scripts/page.php?site_id=projects&item_id=graphite_home" @@ -61,6 +61,9 @@ src_prepare() { } multilib_src_configure() { + # ODR (bug #875224) + filter-lto + local mycmakeargs=( # Renamed VM_MACHINE_TYPE to GRAPHITE2_VM_TYPE -DGRAPHITE2_VM_TYPE=direct