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 B7B5C158041 for ; Thu, 14 Mar 2024 02:25:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EDE51E29B8; Thu, 14 Mar 2024 02:25:45 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 CFB0CE29B8 for ; Thu, 14 Mar 2024 02:25:45 +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 0E82F33BEE9 for ; Thu, 14 Mar 2024 02:25:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 43E9F151A for ; Thu, 14 Mar 2024 02:25:43 +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: <1710381590.9ab2a18c756f5ff7b962584d3563fa7c554add79.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsbabel/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild sci-geosciences/gpsbabel/gpsbabel-1.8.0-r1.ebuild X-VCS-Directories: sci-geosciences/gpsbabel/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 9ab2a18c756f5ff7b962584d3563fa7c554add79 X-VCS-Branch: master Date: Thu, 14 Mar 2024 02:25:43 +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: 41de7906-9e7e-426f-b340-f8af4cce52ea X-Archives-Hash: ca8b6d1250d66b248b02dd1aa54b730a commit: 9ab2a18c756f5ff7b962584d3563fa7c554add79 Author: Eli Schwartz gmail com> AuthorDate: Thu Mar 14 01:30:38 2024 +0000 Commit: Sam James gentoo org> CommitDate: Thu Mar 14 01:59:50 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ab2a18c sci-geosciences/gpsbabel: mark as LTO-unsafe Only in older versions. It is fixed starting 1.9.0 Closes: https://bugs.gentoo.org/862576 Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Sam James gentoo.org> sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild | 9 +++++++-- sci-geosciences/gpsbabel/gpsbabel-1.8.0-r1.ebuild | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild index f6c49d49af26..36dfe7b2188f 100644 --- a/sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild +++ b/sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.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 qmake-utils +inherit flag-o-matic qmake-utils MY_PV="${PV//./_}" MY_P="${PN}_${MY_PV}" @@ -64,6 +64,11 @@ src_prepare() { } src_configure() { + # -Werror=odr + # https://bugs.gentoo.org/862576 + # Fixed in newer versions: https://github.com/GPSBabel/gpsbabel/pull/824 + filter-lto + econf \ $(use_with doc doc "${S}"/doc/manual) \ QMAKE=$(qt5_get_bindir)/qmake \ diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.8.0-r1.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.8.0-r1.ebuild index cfe639e603e8..7e4d5bf44ef1 100644 --- a/sci-geosciences/gpsbabel/gpsbabel-1.8.0-r1.ebuild +++ b/sci-geosciences/gpsbabel/gpsbabel-1.8.0-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 CMAKE_IN_SOURCE_BUILD=1 -inherit cmake desktop xdg +inherit cmake desktop flag-o-matic xdg MY_PV="${PV//./_}" MY_P="${PN}_${MY_PV}" @@ -76,6 +76,11 @@ src_prepare() { } src_configure() { + # -Werror=odr + # https://bugs.gentoo.org/862576 + # Fixed in newer versions: https://github.com/GPSBabel/gpsbabel/pull/824 + filter-lto + local mycmakeargs=( -DGPSBABEL_WITH_LIBUSB=pkgconfig -DGPSBABEL_WITH_SHAPELIB=pkgconfig