guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

14/19: gnu: libftdi: Build ftdi_eeprom.


From: guix-commits
Subject: 14/19: gnu: libftdi: Build ftdi_eeprom.
Date: Thu, 14 Sep 2023 17:45:22 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit d92c71f1d63cd89e4805c4dfde8f4deed9d037cf
Author: Simon South <simon@simonsouth.net>
AuthorDate: Thu Sep 7 12:37:54 2023 -0400

    gnu: libftdi: Build ftdi_eeprom.
    
    * 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.
    
    Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 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 1e97793a93..b3fb717905 100644
--- a/gnu/packages/libftdi.scm
+++ b/gnu/packages/libftdi.scm
@@ -24,7 +24,9 @@
   #: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 @@
     (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 @@
     (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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]