From patchwork Thu Sep 7 15:45:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 53635 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9347427BBEB; Thu, 7 Sep 2023 16:47:55 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4024327BBE9 for ; Thu, 7 Sep 2023 16:47:55 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qeHDi-0007If-Qw; Thu, 07 Sep 2023 11:47:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qeHDg-0007HS-Lm for guix-patches@gnu.org; Thu, 07 Sep 2023 11:47:00 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qeHDg-0004BW-DX for guix-patches@gnu.org; Thu, 07 Sep 2023 11:47:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qeHDi-0005dm-3b for guix-patches@gnu.org; Thu, 07 Sep 2023 11:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65807] [PATCH 1/8] gnu: libftdi: Update package style. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 07 Sep 2023 15:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65807 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65807@debbugs.gnu.org Received: via spool by 65807-submit@debbugs.gnu.org id=B65807.169410156221511 (code B ref 65807); Thu, 07 Sep 2023 15:47:02 +0000 Received: (at 65807) by debbugs.gnu.org; 7 Sep 2023 15:46:02 +0000 Received: from localhost ([127.0.0.1]:41096 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeHCj-0005ao-RM for submit@debbugs.gnu.org; Thu, 07 Sep 2023 11:46:02 -0400 Received: from mailout.easymail.ca ([64.68.200.34]:59198) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeHCh-0005a9-K0 for 65807@debbugs.gnu.org; Thu, 07 Sep 2023 11:46:00 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 9C237E2E13 for <65807@debbugs.gnu.org>; Thu, 7 Sep 2023 15:45:52 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo08-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo08-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YRnnnXWetIaO for <65807@debbugs.gnu.org>; Thu, 7 Sep 2023 15:45:52 +0000 (UTC) Received: from laptop.smallsystems.net (23-233-96-210.cpe.pppoe.ca [23.233.96.210]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 2A787E2DD1 for <65807@debbugs.gnu.org>; Thu, 7 Sep 2023 15:45:52 +0000 (UTC) From: Simon South Date: Thu, 7 Sep 2023 11:45:43 -0400 Message-Id: <5a534789eab223f4d1f5a8c8b4b275c0f175f095.1694100583.git.simon@simonsouth.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/libftdi.scm: Re-order #:use-module statements. (libftdi): Wrap long lines; reformat gently. [license]: Use "license:" prefix. --- gnu/packages/libftdi.scm | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/gnu/packages/libftdi.scm b/gnu/packages/libftdi.scm index e39e0b3d71..4cfa1d3424 100644 --- a/gnu/packages/libftdi.scm +++ b/gnu/packages/libftdi.scm @@ -18,12 +18,12 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages libftdi) - #:use-module (guix licenses) + #:use-module (guix build-system cmake) #:use-module (guix download) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (gnu packages) - #:use-module (gnu packages libusb) - #:use-module (guix build-system cmake)) + #:use-module (gnu packages libusb)) (define-public libftdi (package @@ -32,18 +32,17 @@ (define-public libftdi (source (origin (method url-fetch) (uri (string-append - "http://www.intra2net.com/en/developer/libftdi/download/libftdi1-" - version ".tar.bz2")) + "http://www.intra2net.com/en/developer/libftdi/download/" + "libftdi1-" version ".tar.bz2")) (sha256 (base32 "0x0vncf6i92slgrn0h7ghkskqbglbs534220qa84d0qg114zndpc")))) (build-system cmake-build-system) (propagated-inputs - (list libusb)) ; required by libftdi1.pc + (list libusb)) ; required by libftdi1.pc (home-page "https://www.intra2net.com/en/developer/libftdi/") (synopsis "FTDI USB driver with bitbang mode") (description - "libFTDI is a library to talk to FTDI chips: FT232BM, -FT245BM, FT2232C, FT2232D, FT245R and FT232H including the popular -bitbangmode.") - (license lgpl2.1))) + "libFTDI is a library to talk to FTDI chips: FT232BM, FT245BM, FT2232C, +FT2232D, FT245R and FT232H including the popular bitbangmode.") + (license license:lgpl2.1))) From patchwork Thu Sep 7 15:45:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 53633 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 908E027BBE9; Thu, 7 Sep 2023 16:47:40 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5EC4827BBE2 for ; Thu, 7 Sep 2023 16:47:39 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qeHDl-0007Js-PK; Thu, 07 Sep 2023 11:47:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qeHDh-0007Ht-2x for guix-patches@gnu.org; Thu, 07 Sep 2023 11:47:01 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qeHDg-0004Bb-Pz for guix-patches@gnu.org; Thu, 07 Sep 2023 11:47:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qeHDi-0005dt-GA for guix-patches@gnu.org; Thu, 07 Sep 2023 11:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65807] [PATCH 2/8] gnu: libftdi: Do not build example programs. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 07 Sep 2023 15:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65807 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65807@debbugs.gnu.org Received: via spool by 65807-submit@debbugs.gnu.org id=B65807.169410156221528 (code B ref 65807); Thu, 07 Sep 2023 15:47:02 +0000 Received: (at 65807) by debbugs.gnu.org; 7 Sep 2023 15:46:02 +0000 Received: from localhost ([127.0.0.1]:41098 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeHCk-0005au-8v for submit@debbugs.gnu.org; Thu, 07 Sep 2023 11:46:02 -0400 Received: from mailout.easymail.ca ([64.68.200.34]:59210) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeHCh-0005aA-ON for 65807@debbugs.gnu.org; Thu, 07 Sep 2023 11:46:00 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id C14DEE2DD1 for <65807@debbugs.gnu.org>; Thu, 7 Sep 2023 15:45:52 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo08-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo08-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7dPYKB1eHIww for <65807@debbugs.gnu.org>; Thu, 7 Sep 2023 15:45:52 +0000 (UTC) Received: from laptop.smallsystems.net (23-233-96-210.cpe.pppoe.ca [23.233.96.210]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 76951E2E12 for <65807@debbugs.gnu.org>; Thu, 7 Sep 2023 15:45:52 +0000 (UTC) From: Simon South Date: Thu, 7 Sep 2023 11:45:44 -0400 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/libftdi.scm (libftdi)[arguments]: Add with "-DEXAMPLES" configure flag. --- gnu/packages/libftdi.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/libftdi.scm b/gnu/packages/libftdi.scm index 4cfa1d3424..ae7cbe62f2 100644 --- a/gnu/packages/libftdi.scm +++ b/gnu/packages/libftdi.scm @@ -20,6 +20,7 @@ (define-module (gnu packages libftdi) #:use-module (guix build-system cmake) #:use-module (guix download) + #:use-module (guix gexp) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (gnu packages) @@ -38,6 +39,8 @@ (define-public libftdi (base32 "0x0vncf6i92slgrn0h7ghkskqbglbs534220qa84d0qg114zndpc")))) (build-system cmake-build-system) + (arguments + (list #:configure-flags #~(list "-DEXAMPLES=OFF"))) (propagated-inputs (list libusb)) ; required by libftdi1.pc (home-page "https://www.intra2net.com/en/developer/libftdi/") From patchwork Thu Sep 7 15:45:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 53636 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1B3DC27BBEA; Thu, 7 Sep 2023 16:47:56 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 60BC427BBE2 for ; Thu, 7 Sep 2023 16:47:54 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qeHED-0007Zz-7x; Thu, 07 Sep 2023 11:47:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qeHDh-0007I4-Ce for guix-patches@gnu.org; Thu, 07 Sep 2023 11:47:01 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qeHDh-0004Bj-4n for guix-patches@gnu.org; Thu, 07 Sep 2023 11:47:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qeHDi-0005e1-RZ for guix-patches@gnu.org; Thu, 07 Sep 2023 11:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65807] [PATCH 3/8] gnu: libftdi: Install libraries to /lib instead of /lib64. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 07 Sep 2023 15:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65807 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65807@debbugs.gnu.org Received: via spool by 65807-submit@debbugs.gnu.org id=B65807.169410156321539 (code B ref 65807); Thu, 07 Sep 2023 15:47:02 +0000 Received: (at 65807) by debbugs.gnu.org; 7 Sep 2023 15:46:03 +0000 Received: from localhost ([127.0.0.1]:41100 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeHCk-0005b9-OT for submit@debbugs.gnu.org; Thu, 07 Sep 2023 11:46:03 -0400 Received: from mailout.easymail.ca ([64.68.200.34]:59226) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeHCi-0005aC-59 for 65807@debbugs.gnu.org; Thu, 07 Sep 2023 11:46:00 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 2FD2DE2E15 for <65807@debbugs.gnu.org>; Thu, 7 Sep 2023 15:45:53 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo08-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo08-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iEQZiBT-eMae for <65807@debbugs.gnu.org>; Thu, 7 Sep 2023 15:45:52 +0000 (UTC) Received: from laptop.smallsystems.net (23-233-96-210.cpe.pppoe.ca [23.233.96.210]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id C93DEE2E12 for <65807@debbugs.gnu.org>; Thu, 7 Sep 2023 15:45:52 +0000 (UTC) From: Simon South Date: Thu, 7 Sep 2023 11:45:45 -0400 Message-Id: <6398cc8bde36ccfb023e1317347edaa862b656ed.1694100583.git.simon@simonsouth.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/libftdi.scm (libftdi)[arguments]<#:configure-flags>: Add "-DLIB_SUFFIX". --- gnu/packages/libftdi.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/libftdi.scm b/gnu/packages/libftdi.scm index ae7cbe62f2..f38346d8b2 100644 --- a/gnu/packages/libftdi.scm +++ b/gnu/packages/libftdi.scm @@ -40,7 +40,10 @@ (define-public libftdi "0x0vncf6i92slgrn0h7ghkskqbglbs534220qa84d0qg114zndpc")))) (build-system cmake-build-system) (arguments - (list #:configure-flags #~(list "-DEXAMPLES=OFF"))) + (list + #:configure-flags + #~(list "-DEXAMPLES=OFF" + "-DLIB_SUFFIX=''"))) ; place libraries in /lib, not /lib64 (propagated-inputs (list libusb)) ; required by libftdi1.pc (home-page "https://www.intra2net.com/en/developer/libftdi/") From patchwork Thu Sep 7 15:45:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 53638 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 402A227BBEA; Thu, 7 Sep 2023 16:48:05 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 916F127BBE2 for ; Thu, 7 Sep 2023 16:48:04 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qeHDu-0007NL-1I; Thu, 07 Sep 2023 11:47:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qeHDi-0007Ij-OP for guix-patches@gnu.org; Thu, 07 Sep 2023 11:47:02 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qeHDi-0004C8-Gr for guix-patches@gnu.org; Thu, 07 Sep 2023 11:47:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qeHDj-0005e8-7P for guix-patches@gnu.org; Thu, 07 Sep 2023 11:47:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65807] [PATCH 4/8] gnu: libftdi: Build ftdi_eeprom. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 07 Sep 2023 15:47:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65807 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65807@debbugs.gnu.org Received: via spool by 65807-submit@debbugs.gnu.org id=B65807.169410156321549 (code B ref 65807); Thu, 07 Sep 2023 15:47:03 +0000 Received: (at 65807) by debbugs.gnu.org; 7 Sep 2023 15:46:03 +0000 Received: from localhost ([127.0.0.1]:41102 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeHCl-0005bM-65 for submit@debbugs.gnu.org; Thu, 07 Sep 2023 11:46:03 -0400 Received: from mailout.easymail.ca ([64.68.200.34]:59234) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeHCi-0005aD-Cy for 65807@debbugs.gnu.org; Thu, 07 Sep 2023 11:46:00 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 6CDE9E2E12 for <65807@debbugs.gnu.org>; Thu, 7 Sep 2023 15:45:53 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo08-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo08-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UVBzlctz43OC for <65807@debbugs.gnu.org>; Thu, 7 Sep 2023 15:45:53 +0000 (UTC) Received: from laptop.smallsystems.net (23-233-96-210.cpe.pppoe.ca [23.233.96.210]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 24BC4E2E16 for <65807@debbugs.gnu.org>; Thu, 7 Sep 2023 15:45:53 +0000 (UTC) From: Simon South Date: Thu, 7 Sep 2023 11:45:46 -0400 Message-Id: <0822dc36d28ded911b8d53e83a0c4032ba5e766b.1694100583.git.simon@simonsouth.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/libftdi.scm (libftdi)[arguments]<#:configure-flags>: Add "-DCMAKE_INSTALL_DOCDIR". [native-inputs]: Add with pkg-config. [inputs]: Add with libconfuse. [license]: Add GPL version 2. --- gnu/packages/libftdi.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/gnu/packages/libftdi.scm b/gnu/packages/libftdi.scm index f38346d8b2..c5461bcf87 100644 --- a/gnu/packages/libftdi.scm +++ b/gnu/packages/libftdi.scm @@ -24,7 +24,9 @@ (define-module (gnu packages libftdi) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (gnu packages) - #:use-module (gnu packages libusb)) + #:use-module (gnu packages libusb) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages textutils)) (define-public libftdi (package @@ -42,8 +44,14 @@ (define-public libftdi (arguments (list #:configure-flags - #~(list "-DEXAMPLES=OFF" + #~(list (string-append "-DCMAKE_INSTALL_DOCDIR=" + #$output "/share/doc/" #$name "-" #$version) + "-DEXAMPLES=OFF" "-DLIB_SUFFIX=''"))) ; place libraries in /lib, not /lib64 + (native-inputs + (list pkg-config)) + (inputs + (list libconfuse)) (propagated-inputs (list libusb)) ; required by libftdi1.pc (home-page "https://www.intra2net.com/en/developer/libftdi/") @@ -51,4 +59,5 @@ (define-public libftdi (description "libFTDI is a library to talk to FTDI chips: FT232BM, FT245BM, FT2232C, FT2232D, FT245R and FT232H including the popular bitbangmode.") - (license license:lgpl2.1))) + (license (list license:gpl2 ; ftdi_eeprom + license:lgpl2.1)))) ; main library From patchwork Thu Sep 7 15:45:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 53637 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A4F0927BBEA; Thu, 7 Sep 2023 16:47:57 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2959227BBE2 for ; Thu, 7 Sep 2023 16:47:57 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qeHDs-0007Mr-At; Thu, 07 Sep 2023 11:47:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qeHDi-0007IJ-3N for guix-patches@gnu.org; Thu, 07 Sep 2023 11:47:02 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qeHDh-0004C0-SA for guix-patches@gnu.org; Thu, 07 Sep 2023 11:47:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qeHDj-0005eE-Ib for guix-patches@gnu.org; Thu, 07 Sep 2023 11:47:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65807] [PATCH 5/8] gnu: libftdi: Build C++ bindings. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 07 Sep 2023 15:47:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65807 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65807@debbugs.gnu.org Received: via spool by 65807-submit@debbugs.gnu.org id=B65807.169410156421562 (code B ref 65807); Thu, 07 Sep 2023 15:47:03 +0000 Received: (at 65807) by debbugs.gnu.org; 7 Sep 2023 15:46:04 +0000 Received: from localhost ([127.0.0.1]:41104 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeHCl-0005bX-LV for submit@debbugs.gnu.org; Thu, 07 Sep 2023 11:46:03 -0400 Received: from mailout.easymail.ca ([64.68.200.34]:59240) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeHCi-0005aE-QX for 65807@debbugs.gnu.org; Thu, 07 Sep 2023 11:46:01 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id C7BBDE2E17 for <65807@debbugs.gnu.org>; Thu, 7 Sep 2023 15:45:53 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo08-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo08-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id R9G7ZD1Z-jxO for <65807@debbugs.gnu.org>; Thu, 7 Sep 2023 15:45:53 +0000 (UTC) Received: from laptop.smallsystems.net (23-233-96-210.cpe.pppoe.ca [23.233.96.210]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 76827E2E16 for <65807@debbugs.gnu.org>; Thu, 7 Sep 2023 15:45:53 +0000 (UTC) From: Simon South Date: Thu, 7 Sep 2023 11:45:47 -0400 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Enabling the C++ bindings allows the test suite to be run, although this fails without access to the host's USB interface. * gnu/packages/libftdi.scm (libftdi)[arguments]: Add #:test-target, #:tests?. (inputs): Add boost. --- gnu/packages/libftdi.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/libftdi.scm b/gnu/packages/libftdi.scm index c5461bcf87..b5f481e9ba 100644 --- a/gnu/packages/libftdi.scm +++ b/gnu/packages/libftdi.scm @@ -24,6 +24,7 @@ (define-module (gnu packages libftdi) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (gnu packages) + #:use-module (gnu packages boost) #:use-module (gnu packages libusb) #:use-module (gnu packages pkg-config) #:use-module (gnu packages textutils)) @@ -47,11 +48,13 @@ (define-public libftdi #~(list (string-append "-DCMAKE_INSTALL_DOCDIR=" #$output "/share/doc/" #$name "-" #$version) "-DEXAMPLES=OFF" - "-DLIB_SUFFIX=''"))) ; place libraries in /lib, not /lib64 + "-DLIB_SUFFIX=''") ; place libraries in /lib, not /lib64 + #:test-target "check" + #:tests? #f)) ; tests fail without access to USB (native-inputs (list pkg-config)) (inputs - (list libconfuse)) + (list boost libconfuse)) (propagated-inputs (list libusb)) ; required by libftdi1.pc (home-page "https://www.intra2net.com/en/developer/libftdi/") @@ -59,5 +62,5 @@ (define-public libftdi (description "libFTDI is a library to talk to FTDI chips: FT232BM, FT245BM, FT2232C, FT2232D, FT245R and FT232H including the popular bitbangmode.") - (license (list license:gpl2 ; ftdi_eeprom + (license (list license:gpl2 ; ftdi_eeprom, C++ bindings license:lgpl2.1)))) ; main library From patchwork Thu Sep 7 15:45:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 53631 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 60B7F27BBE2; Thu, 7 Sep 2023 16:47:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DF8F727BBE9 for ; Thu, 7 Sep 2023 16:47:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qeHDy-0007S6-D6; Thu, 07 Sep 2023 11:47:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qeHDi-0007Ii-Mr for guix-patches@gnu.org; Thu, 07 Sep 2023 11:47:02 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qeHDi-0004C6-CH for guix-patches@gnu.org; Thu, 07 Sep 2023 11:47:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qeHDk-0005eM-1g for guix-patches@gnu.org; Thu, 07 Sep 2023 11:47:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65807] [PATCH 6/8] gnu: libftdi: Build Python bindings. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 07 Sep 2023 15:47:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65807 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65807@debbugs.gnu.org Received: via spool by 65807-submit@debbugs.gnu.org id=B65807.169410157121606 (code B ref 65807); Thu, 07 Sep 2023 15:47:04 +0000 Received: (at 65807) by debbugs.gnu.org; 7 Sep 2023 15:46:11 +0000 Received: from localhost ([127.0.0.1]:41111 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeHCt-0005cO-2R for submit@debbugs.gnu.org; Thu, 07 Sep 2023 11:46:11 -0400 Received: from mailout.easymail.ca ([64.68.200.34]:59338) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeHCn-0005aQ-EZ for 65807@debbugs.gnu.org; Thu, 07 Sep 2023 11:46:06 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 2767CE2E16 for <65807@debbugs.gnu.org>; Thu, 7 Sep 2023 15:45:54 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo08-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo08-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id B5YcplPGqT7l for <65807@debbugs.gnu.org>; Thu, 7 Sep 2023 15:45:53 +0000 (UTC) Received: from laptop.smallsystems.net (23-233-96-210.cpe.pppoe.ca [23.233.96.210]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id C8184E2E18 for <65807@debbugs.gnu.org>; Thu, 7 Sep 2023 15:45:53 +0000 (UTC) From: Simon South Date: Thu, 7 Sep 2023 11:45:48 -0400 Message-Id: <659b947425e7f82f19f4a04f5d7986ad77dbfd63.1694100583.git.simon@simonsouth.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/libftdi.scm (libftdi)[outputs]: Add "python". [arguments]<#:phases>: Add with "install-python-binding" phase. [native-inputs]: Add python, swig. --- gnu/packages/libftdi.scm | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/gnu/packages/libftdi.scm b/gnu/packages/libftdi.scm index b5f481e9ba..d9ebd4a2df 100644 --- a/gnu/packages/libftdi.scm +++ b/gnu/packages/libftdi.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Manolis Fragkiskos Ragkousis ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2023 Simon South ;;; ;;; This file is part of GNU Guix. ;;; @@ -18,15 +19,19 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages libftdi) + #:use-module (guix build utils) #:use-module (guix build-system cmake) #:use-module (guix download) #:use-module (guix gexp) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages boost) #:use-module (gnu packages libusb) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) + #:use-module (gnu packages swig) #:use-module (gnu packages textutils)) (define-public libftdi @@ -42,6 +47,7 @@ (define-public libftdi (base32 "0x0vncf6i92slgrn0h7ghkskqbglbs534220qa84d0qg114zndpc")))) (build-system cmake-build-system) + (outputs '("out" "python")) (arguments (list #:configure-flags @@ -49,10 +55,26 @@ (define-public libftdi #$output "/share/doc/" #$name "-" #$version) "-DEXAMPLES=OFF" "-DLIB_SUFFIX=''") ; place libraries in /lib, not /lib64 + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'install-python-binding + (lambda _ + (let* ((python-version + #$(version-major+minor (package-version python))) + (python-lib-path + (string-append "/lib/python" python-version))) + (mkdir-p (string-append #$output:python "/lib")) + (mkdir-p (string-append #$output:python "/share/libftdi")) + (rename-file (string-append #$output python-lib-path) + (string-append #$output:python python-lib-path)) + (rename-file (string-append #$output + "/share/libftdi/examples") + (string-append #$output:python + "/share/libftdi/examples")))))) #:test-target "check" #:tests? #f)) ; tests fail without access to USB (native-inputs - (list pkg-config)) + (list pkg-config python swig)) (inputs (list boost libconfuse)) (propagated-inputs From patchwork Thu Sep 7 15:45:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 53632 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id BA77927BBEA; Thu, 7 Sep 2023 16:47:36 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A414C27BBE2 for ; Thu, 7 Sep 2023 16:47:35 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qeHDp-0007KD-0U; Thu, 07 Sep 2023 11:47:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qeHDj-0007Iy-Bg for guix-patches@gnu.org; Thu, 07 Sep 2023 11:47:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qeHDj-0004CM-38 for guix-patches@gnu.org; Thu, 07 Sep 2023 11:47:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qeHDk-0005eb-PN for guix-patches@gnu.org; Thu, 07 Sep 2023 11:47:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65807] [PATCH 7/8] gnu: libftdi: Update to 1.5. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 07 Sep 2023 15:47:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65807 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65807@debbugs.gnu.org Received: via spool by 65807-submit@debbugs.gnu.org id=B65807.169410157321621 (code B ref 65807); Thu, 07 Sep 2023 15:47:04 +0000 Received: (at 65807) by debbugs.gnu.org; 7 Sep 2023 15:46:13 +0000 Received: from localhost ([127.0.0.1]:41115 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeHCt-0005cZ-TX for submit@debbugs.gnu.org; Thu, 07 Sep 2023 11:46:13 -0400 Received: from mailout.easymail.ca ([64.68.200.34]:59336) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeHCn-0005aP-EZ for 65807@debbugs.gnu.org; Thu, 07 Sep 2023 11:46:06 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id DBE98E2E1A for <65807@debbugs.gnu.org>; Thu, 7 Sep 2023 15:45:54 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo08-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo08-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YiTWkHCVdsIF for <65807@debbugs.gnu.org>; Thu, 7 Sep 2023 15:45:54 +0000 (UTC) Received: from laptop.smallsystems.net (23-233-96-210.cpe.pppoe.ca [23.233.96.210]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 3165DE2E19 for <65807@debbugs.gnu.org>; Thu, 7 Sep 2023 15:45:54 +0000 (UTC) From: Simon South Date: Thu, 7 Sep 2023 11:45:49 -0400 Message-Id: <40a4075d34a5a29b74c6bd9cb9d36698e5d24eeb.1694100583.git.simon@simonsouth.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/libftdi-fix-paths-when-FTDIPP-set.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/libftdi.scm (libftdi): Update to 1.5. [source]: Apply patch. [arguments]<#:configure-flags>: Add "-DFTDIPP", "-DPYTHON_BINDINGS". --- gnu/local.mk | 1 + gnu/packages/libftdi.scm | 10 +++-- .../libftdi-fix-paths-when-FTDIPP-set.patch | 39 +++++++++++++++++++ 3 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/libftdi-fix-paths-when-FTDIPP-set.patch diff --git a/gnu/local.mk b/gnu/local.mk index 54aec9316a..1f1f9450ab 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1445,6 +1445,7 @@ dist_patch_DATA = \ %D%/packages/patches/json-c-0.12-CVE-2020-12762.patch \ %D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch \ %D%/packages/patches/julia-Use-MPFR-4.2.patch \ + %D%/packages/patches/libftdi-fix-paths-when-FTDIPP-set.patch \ %D%/packages/patches/libgeotiff-fix-tests-with-proj-9.1.1.patch \ %D%/packages/patches/libobjc2-unbundle-robin-map.patch \ %D%/packages/patches/librime-fix-build-with-gcc10.patch \ diff --git a/gnu/packages/libftdi.scm b/gnu/packages/libftdi.scm index d9ebd4a2df..ae3e6cf660 100644 --- a/gnu/packages/libftdi.scm +++ b/gnu/packages/libftdi.scm @@ -37,7 +37,7 @@ (define-module (gnu packages libftdi) (define-public libftdi (package (name "libftdi") - (version "1.4") + (version "1.5") (source (origin (method url-fetch) (uri (string-append @@ -45,7 +45,9 @@ (define-public libftdi "libftdi1-" version ".tar.bz2")) (sha256 (base32 - "0x0vncf6i92slgrn0h7ghkskqbglbs534220qa84d0qg114zndpc")))) + "0jdh5r499wbz83vmpskczq5m3cfc1mcv8xqisj5i95k1r3lr2w3w")) + (patches + (search-patches "libftdi-fix-paths-when-FTDIPP-set.patch")))) (build-system cmake-build-system) (outputs '("out" "python")) (arguments @@ -54,7 +56,9 @@ (define-public libftdi #~(list (string-append "-DCMAKE_INSTALL_DOCDIR=" #$output "/share/doc/" #$name "-" #$version) "-DEXAMPLES=OFF" - "-DLIB_SUFFIX=''") ; place libraries in /lib, not /lib64 + "-DFTDIPP=ON" + "-DLIB_SUFFIX=''" ; place libraries in /lib, not /lib64 + "-DPYTHON_BINDINGS=ON") #:phases #~(modify-phases %standard-phases (add-after 'install 'install-python-binding diff --git a/gnu/packages/patches/libftdi-fix-paths-when-FTDIPP-set.patch b/gnu/packages/patches/libftdi-fix-paths-when-FTDIPP-set.patch new file mode 100644 index 0000000000..0a81cceb26 --- /dev/null +++ b/gnu/packages/patches/libftdi-fix-paths-when-FTDIPP-set.patch @@ -0,0 +1,39 @@ +commit cdb28383402d248dbc6062f4391b038375c52385 +Author: Fabrice Fontaine +Date: Fri Jul 17 21:25:03 2020 +0200 + + CMakeLists.txt: fix paths when FTDIPP is set + + Use the same project name (i.e. libftdi1 and not libftdipp1) when FTDIPP + is enabled as suggested by Aurelien Jarno in + http://developer.intra2net.com/mailarchive/html/libftdi/2020/msg00044.html + + Without this change, the libftdi1.pc config file defines the include + path as /usr/local/include/libftdipp1 while the ftdi.h file is actually + installed in /usr/local/include/libftdi1 + + This is an issue for example for libsigrok which will fail on: + + In file included from src/hardware/asix-sigma/protocol.c:27: + src/hardware/asix-sigma/protocol.h:28:10: fatal error: ftdi.h: No such file or directory + 28 | #include + | ^~~~~~~~ + + Fixes: + - http://autobuild.buildroot.org/results/1427f44e36752c337791597fab47a1889552a2fe + + Signed-off-by: Fabrice Fontaine + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5aecafc..3b0b87c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -136,7 +136,7 @@ endif () + + add_subdirectory(src) + if ( FTDIPP ) +- project(libftdipp1 C CXX) ++ project(libftdi1 C CXX) + add_subdirectory(ftdipp) + endif () + if ( PYTHON_BINDINGS ) From patchwork Thu Sep 7 15:45:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 53634 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3178227BBEA; Thu, 7 Sep 2023 16:47:43 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5A41727BBE2 for ; Thu, 7 Sep 2023 16:47:42 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qeHE1-0007V9-4d; Thu, 07 Sep 2023 11:47:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qeHDj-0007Ix-Bb for guix-patches@gnu.org; Thu, 07 Sep 2023 11:47:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qeHDi-0004CJ-NT for guix-patches@gnu.org; Thu, 07 Sep 2023 11:47:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qeHDk-0005eU-E5 for guix-patches@gnu.org; Thu, 07 Sep 2023 11:47:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65807] [PATCH 8/8] gnu: libftdi: Build API documentation. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 07 Sep 2023 15:47:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65807 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65807@debbugs.gnu.org Received: via spool by 65807-submit@debbugs.gnu.org id=B65807.169410157221613 (code B ref 65807); Thu, 07 Sep 2023 15:47:04 +0000 Received: (at 65807) by debbugs.gnu.org; 7 Sep 2023 15:46:12 +0000 Received: from localhost ([127.0.0.1]:41113 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeHCt-0005cR-HZ for submit@debbugs.gnu.org; Thu, 07 Sep 2023 11:46:11 -0400 Received: from mailout.easymail.ca ([64.68.200.34]:59340) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeHCn-0005aT-JJ for 65807@debbugs.gnu.org; Thu, 07 Sep 2023 11:46:06 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 29CB1E2E19 for <65807@debbugs.gnu.org>; Thu, 7 Sep 2023 15:45:56 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo08-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo08-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NZuCv-xI_CLj for <65807@debbugs.gnu.org>; Thu, 7 Sep 2023 15:45:54 +0000 (UTC) Received: from laptop.smallsystems.net (23-233-96-210.cpe.pppoe.ca [23.233.96.210]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 88EC7E2E18 for <65807@debbugs.gnu.org>; Thu, 7 Sep 2023 15:45:54 +0000 (UTC) From: Simon South Date: Thu, 7 Sep 2023 11:45:50 -0400 Message-Id: <08486d261a51ddd5b64110e9ef2802fdf0b31f46.1694100583.git.simon@simonsouth.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/libftdi.scm (libftdi)[outputs]: Add "doc" output. [arguments]<#:configure-flags>: Add "-DDOCUMENTATION". <#:phases>: Add "install-documentation" phase. [native-inputs]: Add doxygen, graphviz. --- gnu/packages/libftdi.scm | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/gnu/packages/libftdi.scm b/gnu/packages/libftdi.scm index ae3e6cf660..f4998cd84e 100644 --- a/gnu/packages/libftdi.scm +++ b/gnu/packages/libftdi.scm @@ -28,6 +28,8 @@ (define-module (gnu packages libftdi) #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages boost) + #:use-module (gnu packages documentation) + #:use-module (gnu packages graphviz) #:use-module (gnu packages libusb) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -49,12 +51,13 @@ (define-public libftdi (patches (search-patches "libftdi-fix-paths-when-FTDIPP-set.patch")))) (build-system cmake-build-system) - (outputs '("out" "python")) + (outputs '("out" "doc" "python")) (arguments (list #:configure-flags #~(list (string-append "-DCMAKE_INSTALL_DOCDIR=" #$output "/share/doc/" #$name "-" #$version) + "-DDOCUMENTATION=ON" "-DEXAMPLES=OFF" "-DFTDIPP=ON" "-DLIB_SUFFIX=''" ; place libraries in /lib, not /lib64 @@ -74,11 +77,20 @@ (define-public libftdi (rename-file (string-append #$output "/share/libftdi/examples") (string-append #$output:python - "/share/libftdi/examples")))))) + "/share/libftdi/examples"))))) + (add-after 'install-python-binding 'install-documentation + (lambda _ + (let ((share (string-append #$output:doc "/share"))) + (copy-recursively "doc/man" + (string-append share "/man")) + (copy-recursively "doc/html" + (string-append share "/doc/" + #$name "-" #$version + "/html")))))) #:test-target "check" #:tests? #f)) ; tests fail without access to USB (native-inputs - (list pkg-config python swig)) + (list doxygen graphviz pkg-config python swig)) (inputs (list boost libconfuse)) (propagated-inputs