From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 finch.gentoo.org (Postfix) with ESMTPS id 146A4158074 for ; Wed, 02 Jul 2025 07:05:36 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 00F3F341ED7 for ; Wed, 02 Jul 2025 07:05:36 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 063D6110320; Wed, 02 Jul 2025 07:05:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id ED696110320 for ; Wed, 02 Jul 2025 07:05:34 +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 9E386341083 for ; Wed, 02 Jul 2025 07:05:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 117092CAC for ; Wed, 02 Jul 2025 07:05:33 +0000 (UTC) From: "Thomas Beierlein" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Beierlein" Message-ID: <1751439912.604a13c0513639cf788049506e7256df1279b85e.tomjbe@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libhackrf/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/libhackrf/libhackrf-2024.02.1-r1.ebuild net-libs/libhackrf/libhackrf-9999.ebuild X-VCS-Directories: net-libs/libhackrf/ X-VCS-Committer: tomjbe X-VCS-Committer-Name: Thomas Beierlein X-VCS-Revision: 604a13c0513639cf788049506e7256df1279b85e X-VCS-Branch: master Date: Wed, 02 Jul 2025 07:05:33 +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: 7e49b1c1-c04a-4979-81a4-3c3e528e3cf2 X-Archives-Hash: 68502e148f5089521dc25e073e731bf4 commit: 604a13c0513639cf788049506e7256df1279b85e Author: Thomas Beierlein gentoo org> AuthorDate: Wed Jul 2 07:04:48 2025 +0000 Commit: Thomas Beierlein gentoo org> CommitDate: Wed Jul 2 07:05:12 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=604a13c0 net-libs/libhackrf: Fix build with cmake4 Closes: https://bugs.gentoo.org/951883 Signed-off-by: Thomas Beierlein gentoo.org> .../{libhackrf-9999.ebuild => libhackrf-2024.02.1-r1.ebuild} | 8 +++++++- net-libs/libhackrf/libhackrf-9999.ebuild | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/net-libs/libhackrf/libhackrf-9999.ebuild b/net-libs/libhackrf/libhackrf-2024.02.1-r1.ebuild similarity index 85% copy from net-libs/libhackrf/libhackrf-9999.ebuild copy to net-libs/libhackrf/libhackrf-2024.02.1-r1.ebuild index 34034a799963..c4f012b76a37 100644 --- a/net-libs/libhackrf/libhackrf-9999.ebuild +++ b/net-libs/libhackrf/libhackrf-2024.02.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -29,6 +29,12 @@ RDEPEND="${DEPEND}" # https://github.com/greatscottgadgets/hackrf/issues/1193 PATCHES=( "${FILESDIR}/hackrf-disable-static-2022.09.1.patch" ) +# Fix build with cmake4 (see https://github.com/greatscottgadgets/hackrf/pull/1514) +src_prepare() { + sed -i -e "s/2.8.12/3.8/" CMakeLists.txt || die + cmake_src_prepare +} + src_configure() { local mycmakeargs=( -DINSTALL_UDEV_RULES="$(usex udev)" diff --git a/net-libs/libhackrf/libhackrf-9999.ebuild b/net-libs/libhackrf/libhackrf-9999.ebuild index 34034a799963..c4f012b76a37 100644 --- a/net-libs/libhackrf/libhackrf-9999.ebuild +++ b/net-libs/libhackrf/libhackrf-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -29,6 +29,12 @@ RDEPEND="${DEPEND}" # https://github.com/greatscottgadgets/hackrf/issues/1193 PATCHES=( "${FILESDIR}/hackrf-disable-static-2022.09.1.patch" ) +# Fix build with cmake4 (see https://github.com/greatscottgadgets/hackrf/pull/1514) +src_prepare() { + sed -i -e "s/2.8.12/3.8/" CMakeLists.txt || die + cmake_src_prepare +} + src_configure() { local mycmakeargs=( -DINSTALL_UDEV_RULES="$(usex udev)"