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