From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 2G2dCJjw+WSnQwEAG6o9tA:P1 (envelope-from ) for ; Thu, 07 Sep 2023 17:47:36 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id 2G2dCJjw+WSnQwEAG6o9tA (envelope-from ) for ; Thu, 07 Sep 2023 17:47:36 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id A64B85791E for ; Thu, 7 Sep 2023 17:47:35 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1694101656; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=cBWVYAFCoyl1H2kT848crsbCNfhObL/uS5rc1Kioh8c=; b=lRL2NNSUtR2eHT5bCaJmfl6G1wuUiA4QU104tcvlGpTzJ9Y6EIH383Qsj/OJBqOQU17Kdz Y+/Id2wFdhmIcU9tsMNsdlw16HC9piXwg6GKKDm4ejqeXnaIA2ignw/BvlvV5RXdphbZgf faVTQ5u7cVU4Y3Aq8wkcjlkEt1E0iaXdBVJdmDTkWRFHLJzaKbanuhAk44quPBLzrPet9f EPq2PTOZoblmF+U/kGoFtoXvZsupCuXqTKtp1QUUfny+ky1dPzMz0v0cqh/8sNA0m8QVxO ntZ/tu2EJpwvXbo09uqxufK+N4bVm8x4HBe05k2q/dyk13TRk+tjJh5TV15Jng== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1694101656; a=rsa-sha256; cv=none; b=R9W0mZ2JXBtVDd52ACJ+H63ny2q8kCyZUfvNrd08yAmPdWNYzhXtdmd8LSHg21xkjhJPw9 e0aLzsVC1kbK+/NHRFDm2cnYm1NkEdS5Vi8H83l9UuldFbDzNOzinHdS13d29t/qNvL6At wtRaFZ4PUmuTMe6EAZHbKGEE20Hj3fnxOLbHDI8xs1poOzE7AglZyqnYVdIWTUQSuc6x0h fdAUH7LH/ASsQrLAfZQlJ0SoWVsGnqpfT37pkXgeez/ir9mA93LDv1wtpUNEZf2bOAlyjJ 8VBW3LXATA5s5bdkNHWjXbs6P4e6vKrL4MM0hWjWYhjhKuIqLA8u05VmGMi8wg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none 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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx2.migadu.com X-Spam-Score: -4.92 X-Migadu-Queue-Id: A64B85791E X-Migadu-Spam-Score: -4.92 X-TUID: 154fGb/Le/IV * 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 ) -- 2.40.1