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 F046115808B for ; Sat, 17 Feb 2024 02:12:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 23B9FE29E9; Sat, 17 Feb 2024 02:12:34 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 086C5E29E9 for ; Sat, 17 Feb 2024 02:12: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 DEB8033FECD for ; Sat, 17 Feb 2024 02:12:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4AA9414AA for ; Sat, 17 Feb 2024 02:12:31 +0000 (UTC) From: "Yixun Lan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Yixun Lan" Message-ID: <1708135932.9ec1edb1acb503243d4f3ea1474298b0b39f7d51.dlan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-embedded/openocd/metadata.xml dev-embedded/openocd/openocd-0.12.0-r2.ebuild dev-embedded/openocd/openocd-9999.ebuild X-VCS-Directories: dev-embedded/openocd/ X-VCS-Committer: dlan X-VCS-Committer-Name: Yixun Lan X-VCS-Revision: 9ec1edb1acb503243d4f3ea1474298b0b39f7d51 X-VCS-Branch: master Date: Sat, 17 Feb 2024 02:12:31 +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: 8a5cdec4-00a6-42a4-ba35-e522cd8b6219 X-Archives-Hash: 09aee13191a685d43918b10263e087e2 commit: 9ec1edb1acb503243d4f3ea1474298b0b39f7d51 Author: Yixun Lan gentoo org> AuthorDate: Sat Feb 17 02:09:57 2024 +0000 Commit: Yixun Lan gentoo org> CommitDate: Sat Feb 17 02:12:12 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ec1edb1 dev-embedded/openocd: make libgpiod optional Closes: https://bugs.gentoo.org/917547 Signed-off-by: Yixun Lan gentoo.org> dev-embedded/openocd/metadata.xml | 1 + .../openocd/{openocd-9999.ebuild => openocd-0.12.0-r2.ebuild} | 11 ++++++++--- dev-embedded/openocd/openocd-9999.ebuild | 7 ++++--- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dev-embedded/openocd/metadata.xml b/dev-embedded/openocd/metadata.xml index b9dbe67059b7..358a9c0a93c5 100644 --- a/dev-embedded/openocd/metadata.xml +++ b/dev-embedded/openocd/metadata.xml @@ -17,6 +17,7 @@ Use dev-libs/capstone for disassembly support Support for CMSIS-DAP compliant adapters Build the dummy port driver + Enable Linux GPIO bitbang support via libgpiod Build the SEGGER J-Link driver Enable support for USB FTDI chips via dev-embedded/libftdi Enable support for parport JTAG devices diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-0.12.0-r2.ebuild similarity index 90% copy from dev-embedded/openocd/openocd-9999.ebuild copy to dev-embedded/openocd/openocd-0.12.0-r2.ebuild index 669feebd09f8..698978b49848 100644 --- a/dev-embedded/openocd/openocd-9999.ebuild +++ b/dev-embedded/openocd/openocd-0.12.0-r2.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 @@ -21,13 +21,13 @@ HOMEPAGE="https://openocd.sourceforge.io" LICENSE="GPL-2+" SLOT="0" -IUSE="capstone +cmsis-dap dummy +ftdi +jlink parport +usb verbose-io" +IUSE="capstone +cmsis-dap dummy +ftdi gpiod +jlink parport +usb verbose-io" RESTRICT="strip" # includes non-native binaries RDEPEND=" acct-group/plugdev >=dev-lang/jimtcl-0.81:= - dev-libs/libgpiod:0/2 + gpiod? ( dev-libs/libgpiod:0/2 ) capstone? ( dev-libs/capstone ) cmsis-dap? ( dev-libs/hidapi ) jlink? ( >=dev-embedded/libjaylink-0.2.0 ) @@ -37,6 +37,10 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" +PATCHES=( + "${FILESDIR}/${PN}-0.12.0-capstone-includedir.patch" +) + src_prepare() { default @@ -66,6 +70,7 @@ src_configure() { $(use_enable ftdi openjtag) $(use_enable ftdi presto) $(use_enable ftdi usb-blaster) + $(use_enable gpiod linuxgpiod) $(use_enable jlink) $(use_enable parport) $(use_enable parport parport_ppdev) diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild index 669feebd09f8..bf5127f94e2c 100644 --- a/dev-embedded/openocd/openocd-9999.ebuild +++ b/dev-embedded/openocd/openocd-9999.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 @@ -21,13 +21,13 @@ HOMEPAGE="https://openocd.sourceforge.io" LICENSE="GPL-2+" SLOT="0" -IUSE="capstone +cmsis-dap dummy +ftdi +jlink parport +usb verbose-io" +IUSE="capstone +cmsis-dap dummy +ftdi gpiod +jlink parport +usb verbose-io" RESTRICT="strip" # includes non-native binaries RDEPEND=" acct-group/plugdev >=dev-lang/jimtcl-0.81:= - dev-libs/libgpiod:0/2 + gpiod? ( dev-libs/libgpiod:0/2 ) capstone? ( dev-libs/capstone ) cmsis-dap? ( dev-libs/hidapi ) jlink? ( >=dev-embedded/libjaylink-0.2.0 ) @@ -66,6 +66,7 @@ src_configure() { $(use_enable ftdi openjtag) $(use_enable ftdi presto) $(use_enable ftdi usb-blaster) + $(use_enable gpiod linuxgpiod) $(use_enable jlink) $(use_enable parport) $(use_enable parport parport_ppdev)