From patchwork Thu Apr 3 15:28:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Denis OSTERLAND-HEIM X-Patchwork-Id: 60671 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 58951C3600C for ; Thu, 3 Apr 2025 15:28:52 +0000 (UTC) Received: from enterprise01.smtp.diehl.com (enterprise01.smtp.diehl.com [193.201.238.219]) by mx.groups.io with SMTP id smtpd.web10.16450.1743694126702001354 for ; Thu, 03 Apr 2025 08:28:47 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@diehl.com header.s=default header.b=YKuGl16N; spf=pass (domain: diehl.com, ip: 193.201.238.219, mailfrom: prvs=181565551=denis.osterland@diehl.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=diehl.com; i=@diehl.com; q=dns/txt; s=default; t=1743694126; x=1775230126; h=from:to:subject:date:message-id: content-transfer-encoding:mime-version; bh=h1lz67VT7ti9YyvI/T/TBBCI+z25xccm9YyGnLfeDNs=; b=YKuGl16NKRwkDeQ0zeKpCGI555Xd1Vk0cZ4US7X+MBxmhgD3AxFb9v1K Odrm0/WUjJ2XJmva1CUa52qK/CeJhUdfil7YHs8SYXpt03DAxfrVxJHfj 75oOFGSDVV+5sfffN1M6hAc5NDNb3hubWHKpQaJYODYl6Ni3FBjPyEfR/ qmR6fjzmaYoeQO1PapxjnIM/pDHbJx32Kt0RunQNzEc+niy1P2ifMXfgG 1Sw2YlO8BpkGoyAEh1j/ip/eZsFZmH3EDYktoqjwkgOcws+npndKjzbzy XNjZbn4IC+cpiG5zGcUnTxzyQtYkk9dlF3miljJ4kd+MtBz6blBxu3Pwg Q==; X-CSE-ConnectionGUID: Gce79UdDS+KtmAWsA6k8UA== X-CSE-MsgGUID: pqBq0776SqijNlgiwiHKQw== X-ThreatScanner-Verdict: Negative IronPort-Data: A9a23:ws9l86A2bZMQMxVW/0jiw5YqxClBgxIJ4kV8jS/XYbTApGsig2RSy WodD2yAPv/cMzOgeN51PI639kgOsJ/cxoVhTANkpHpgcSlH+JHPbTi7wuUcHAvPdJGZHBI/h yk6QoOdRCzhZiaE/n9BCpC48z8kk/nOHuegYAL9EngZbRd+Tys8gg5Ulec8g4p56fC0GArlV ena+qUzA3f7nWcpWo4ow/jb8k434Kyp4GlwUmEWPpingnePzhH5M7pPfcldH1OgKqFIE+izQ fr0zb3R1gvx4xc3B9q5pa3we0sMT6S6FVDmZq1+AvXKbrBq/0Te445jXBYuQR4/Zwahxrid/ O5wWamYEm/FCEFudNM1CHG0GwkmVUFPFSSuzXKX6aR/xGWeG5fgLmkH4Ojb8uT0984uaVyi+ 8D0JxgiZR3c1t+67In4afVpr/s4BZfobL427yQIITHxVZ7KQLj5aInhoPpx/RNr3oZFGuzGI cYYZDprKh/HZnWjOH9OUNRnwbzu3T+mKGUwRFG9/MLb50DfwQpwy/7qK8bYYNiDQ8l9kkeVp maA9GP8av0fHIXGmWbYqSPy34cjmwvjQagLTOLnqMVzgV+1wmMSFxw2dmKk9KzRZkmWHog3x 1Yv0i02oK4/8UamQtXwU1i0rWCJujYYWsFMCKs98AyLx6/e7gqVC2RCSSROAOHKr+dvHXpzi wTPxJWwXmQHXKCpdE9xP4y89VuaURX550dYDcPYZWPpO+Xenbw= IronPort-HdrOrdr: A9a23:HQssBq9RpgmsRubYYAZuk+H8db1zdoMgy1knxilNoENuGfBwxv rFoB1E73LJYDZ4YhEdcPS7Sc69qBTnhOdICOgqTNGftWzdyR+Vxe5ZnOnfKlHbdREWldQtsZ uIEZIObeEYZGIS5anHCWGDf+rIq+P3k5xA692+815dCQtubb1sqx10ABqBElBnLTM2cKYRJd 6X48xaqn67dX4KdcSnFj0pX+bOvcCjruOUXTc2QxQj7hWCySml4qLgEwWJmigfSC9U270r9g H+4nLEz5TmufS81hKZzWPY849XhcukwN1FA8CHl6EuW0XRozftboFmR7DHpjw+vPqu9UZvms LdugpIBbUImg6hARDGnTLdnwPk1ioir2Xvw0OCgWby5cbjVCsmT9NGgIJSYnLimjYdleA52q dMw2/crZZcEQjBgTS46tjTXRRjlk65uhMZ4J8upk0aW44ZdLIUt4AU4FhUDYdFBy7x6JkmHO 5yZfusn8p+QBeRanbEsy10zNaxRXQvDlOdTk8Ottf96UkvoExE X-Talos-CUID: 9a23:ki4PHmHq4m+coU4iqmJI/0NLS/0pXkae72vVCnCjIDhqGIC8HAo= X-Talos-MUID: 9a23:ZfAcxwi8fEnBrnyYRhU3osMpLN5C+vzxVx42iJQEnc2LNDNxGxSkk2Hi X-IronPort-AV: E=Sophos;i="6.15,184,1739833200"; d="scan'208";a="118453961" From: Denis OSTERLAND-HEIM To: "openembedded-devel@lists.openembedded.org" Subject: [PATCH] libftdi: cpp-wrapper fix cmake support Thread-Topic: [PATCH] libftdi: cpp-wrapper fix cmake support Thread-Index: AdukrQadwxN0+KlrTliHHu2rgDEPFA== Date: Thu, 3 Apr 2025 15:28:44 +0000 Message-ID: <954c1fdb92cb44d6b8dc3cd56dbb2b92@diehl.com> Accept-Language: de-DE, en-US Content-Language: de-DE X-MS-Has-Attach: X-MS-TNEF-Correlator: x-disclaimerprocessed: True MIME-Version: 1.0 X-GBS-PROC: JH31JkgOAVpzNaKNEwNMTVei7Pxwj1EHy8uvHHRQFlss2eZLX8QDQWMN+ck7WfIp X-GBS-PROCJOB: q0aT6BXn3kd8ojdzO1c6ze6TXT75XgGS6wJ4YFFsj/GF0Tud5LT3Qggg4/ed4y45 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 03 Apr 2025 15:28:52 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/116543 Backport fix for C++ wrapper cmake support. Signed-off-by: Denis Osterland-Heim --- ...sts-txt-fix-paths-when-FTDIPP-is-set.patch | 45 +++++++++++++++++++ .../recipes-support/libftdi/libftdi_1.5.bb | 5 ++- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-support/libftdi/files/CMakeLists-txt-fix-paths-when-FTDIPP-is-set.patch -- 2.47.2 Diehl Metering GmbH, Donaustrasse 120, 90451 Nuernberg Sitz der Gesellschaft: Ansbach, Registergericht: Ansbach HRB 69 Geschaeftsfuehrer: Dr. Christof Bosbach (Sprecher), Dipl.-Dolm. Annette Geuther, Dipl.-Kfm. Reiner Edel, Jean-Claude Luttringer Bitte denken Sie an die Umwelt, bevor Sie diese E-Mail drucken. Diese E-Mail kann vertrauliche Informationen enthalten. Sollten die in dieser E-Mail enthaltenen Informationen nicht für Sie bestimmt sein, informieren Sie bitte unverzueglich den Absender per E-Mail und loeschen Sie diese E-Mail in Ihrem System. Jede unberechtigte Form der Reproduktion, Bekanntgabe, Aenderung, Verteilung und/oder Publikation dieser E-Mail ist strengstens untersagt. Informationen zum Datenschutz finden Sie auf unserer Homepage. Before printing, think about environmental responsibility.This message may contain confidential information. If you are not authorized to receive this information please advise the sender immediately by reply e-mail and delete this message without making any copies. Any form of unauthorized use, publication, reproduction, copying or disclosure of the e-mail is not permitted. Information about data protection can be found on our homepage. diff --git a/meta-oe/recipes-support/libftdi/files/CMakeLists-txt-fix-paths-when-FTDIPP-is-set.patch b/meta-oe/recipes-support/libftdi/files/CMakeLists-txt-fix-paths-when-FTDIPP-is-set.patch new file mode 100644 index 0000000000..2fa35877a7 --- /dev/null +++ b/meta-oe/recipes-support/libftdi/files/CMakeLists-txt-fix-paths-when-FTDIPP-is-set.patch @@ -0,0 +1,45 @@ +From cdb28383402d248dbc6062f4391b038375c52385 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 17 Jul 2020 21:25:03 +0200 +Subject: [PATCH] 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 +Upstream-Status: Backport [http://developer.intra2net.com/git/?p=libftdi;a=patch;h=cdb28383402d248dbc6062f4391b038375c52385] +--- + CMakeLists.txt | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +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 ) +-- +1.7.1 + diff --git a/meta-oe/recipes-support/libftdi/libftdi_1.5.bb b/meta-oe/recipes-support/libftdi/libftdi_1.5.bb index 0284ad7e22..1679f212b3 100644 --- a/meta-oe/recipes-support/libftdi/libftdi_1.5.bb +++ b/meta-oe/recipes-support/libftdi/libftdi_1.5.bb @@ -11,7 +11,10 @@ LIC_FILES_CHKSUM = "\ DEPENDS = "libusb1 python3 swig-native" -SRC_URI = "http://www.intra2net.com/en/developer/${BPN}/download/${BPN}1-${PV}.tar.bz2" +SRC_URI = "\ + http://www.intra2net.com/en/developer/${BPN}/download/${BPN}1-${PV}.tar.bz2 \ + file://CMakeLists-txt-fix-paths-when-FTDIPP-is-set.patch \ +" SRC_URI[sha256sum] = "7c7091e9c86196148bd41177b4590dccb1510bfe6cea5bf7407ff194482eb049" UPSTREAM_CHECK_URI = "http://www.intra2net.com/en/developer/libftdi/download.php"