From patchwork Tue Jul 5 10:27:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 644704 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rkLXN5x74z9t0T for ; Tue, 5 Jul 2016 21:00:52 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=analog.onmicrosoft.com header.i=@analog.onmicrosoft.com header.b=eXgLNGzo; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 049B18A105; Tue, 5 Jul 2016 11:00:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id swdXWr7QHst5; Tue, 5 Jul 2016 11:00:48 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 8463389F0E; Tue, 5 Jul 2016 11:00:48 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 503C81CE463 for ; Tue, 5 Jul 2016 11:00:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4D3EB89CB4 for ; Tue, 5 Jul 2016 11:00:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UM8TNZiUrUV8 for ; Tue, 5 Jul 2016 11:00:45 +0000 (UTC) X-Greylist: delayed 00:20:16 by SQLgrey-1.7.6 Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0075.outbound.protection.outlook.com [104.47.37.75]) by whitealder.osuosl.org (Postfix) with ESMTPS id 691F687CE9 for ; Tue, 5 Jul 2016 11:00:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=analog.onmicrosoft.com; s=selector1-analog-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=Gr0ErcMob+WQJOrznqeR2rgzO+VU5OhD41Cqg/Cp8sE=; b=eXgLNGzohwiZ7RuyIt+IQ1IJjO11HedMmd0xrEwShJVDCwYB4jUYIHeFhrhdJboRvSDpOAMSAWBHdDc2c4smuTqVuIfrsLb1DgUHQU4ZCRQsZHsl05QRJ0ji9jK2JUKJvNkdyfup6ghY63IcjPEbjbe55JkeBvlgF6gJdyu3Cyk= Received: from BN3PR0301CA0049.namprd03.prod.outlook.com (10.160.152.145) by CY1PR0301MB1180.namprd03.prod.outlook.com (10.160.165.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.523.12; Tue, 5 Jul 2016 10:27:38 +0000 Received: from BN1AFFO11FD010.protection.gbl (2a01:111:f400:7c10::102) by BN3PR0301CA0049.outlook.office365.com (2a01:111:e400:401e::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.534.14 via Frontend Transport; Tue, 5 Jul 2016 10:27:37 +0000 Authentication-Results: spf=pass (sender IP is 137.71.25.57) smtp.mailfrom=analog.com; busybox.net; dkim=none (message not signed) header.d=none;busybox.net; dmarc=bestguesspass action=none header.from=analog.com; Received-SPF: Pass (protection.outlook.com: domain of analog.com designates 137.71.25.57 as permitted sender) receiver=protection.outlook.com; client-ip=137.71.25.57; helo=nwd2mta2.analog.com; Received: from nwd2mta2.analog.com (137.71.25.57) by BN1AFFO11FD010.mail.protection.outlook.com (10.58.52.70) with Microsoft SMTP Server (TLS) id 15.1.534.7 via Frontend Transport; Tue, 5 Jul 2016 10:27:37 +0000 Received: from NWD2HUBCAS8.ad.analog.com (nwd2hubcas8.ad.analog.com [10.64.69.108]) by nwd2mta2.analog.com (8.13.8/8.13.8) with ESMTP id u65ESNVT012189 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL) for ; Tue, 5 Jul 2016 10:28:23 -0400 Received: from zeus.spd.analog.com (10.64.82.11) by NWD2HUBCAS8.ad.analog.com (10.64.69.108) with Microsoft SMTP Server id 14.3.210.2; Tue, 5 Jul 2016 06:27:37 -0400 Received: from carl.ad.analog.com ([10.43.17.157]) by zeus.spd.analog.com (8.15.1/8.15.1) with ESMTP id u65ARZEn001514; Tue, 5 Jul 2016 06:27:36 -0400 From: Paul Cercueil To: Date: Tue, 5 Jul 2016 12:27:28 +0200 Message-ID: <1467714448-19177-1-git-send-email-paul.cercueil@analog.com> X-Mailer: git-send-email 2.8.1 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:137.71.25.57; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(2980300002)(438002)(189002)(199003)(11100500001)(50986999)(8676002)(86362001)(575784001)(107886002)(246002)(110136002)(15975445007)(36756003)(48376002)(586003)(87936001)(6806005)(92566002)(50466002)(106466001)(229853001)(4001430100002)(356003)(2351001)(5003600100003)(4326007)(33646002)(7636002)(8936002)(5003940100001)(2906002)(450100001)(77096005)(19580395003)(50226002)(19580405001)(47776003)(189998001)(7696003)(305945005)(7846002)(19627235001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0301MB1180; H:nwd2mta2.analog.com; FPR:; SPF:Pass; PTR:nwd2mail11.analog.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD010; 1:r7lcSuoy96rwC16DaN3GicHlZcO/UrHDbCi/ryXLMtt38Qw2dgnq6b3Dm3mmafQjL5QKi8HpTU0mDYGkHXYaUcBgWVOI0KgoVH2WVw9C+V5XUjrTTZqa3KvVr+3jf35bIklCSgUSYXd/IAsN/leiXjGpmHxKmCOHlJYg5AtDVC8R38V+Mg8Qd9dKgs/Pc7GDkORAO72QOxaOZrVY2eVdelU0tSEozSfSaHf2dFzUn4/hIxBQRNAPsQS4qvj6TdRJVZ33OCvZn3Gm1PBdjsOeP288v816wvcb8D9JPB+QEYM3NTqk5KCMVtYOykuQ3JLh9UmEcxCSMfPfknTb3zSbzgtY59AxF5oqft0H2du4qPC0e5GUFXGhK6tp2kaAuRuzm33xpOzJ0u+uMbBLbe5Ht1Lb/OsDmcoBn3vUBchLKZSCA00b/29x5BSrmNRub5zV5P/tnO5zD+DxuUxQj0ibZxImrhQy0Fc/CE956oC/mV0zUeJIPnRGj8KBJSFHkajHAIanVHUCrnpfP3HIgn+Qq0oI9rw6cp3oiH/AuXb5SQqmdoaU1HRoM1vUObclMvPx X-MS-Office365-Filtering-Correlation-Id: 13c8a3f2-defe-4546-35e5-08d3a4befc89 X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1180; 2:1BJXnRclyUH/Eou27zvqxACbL2nlgrkBrSGMhBqAFpd0u7+jnvEifGCHxSxHnWPWHvw8waewneJGpIJczC7GeubtrBVZk+C2D3A6A0iVt8zizHYFjdFZ8TFGw5I8qcBKwwukv6sb+omKmzcP3+37zkQ2hsyXzp0w6XtrZFz4uUUOjl5BCqdvJWLtEXiuX8Ev; 3:ypetkyvJiYwN/9rvvI/6M8KIISuPR5JOgY32DhR+pVE4v2C2rp1eTA4LD9Et7OrCyaUYIz1aST2SkF3GKcSeBaH0EwSjsRgObfY4IS29pu/rY0nNe4WYLdZUtn102pvPZmvEkTqu5JxgViQlqqH19e+NfiKD04EwiBdKFF7O4MqdCimL4yUUVvFUEkRw0ju5fZ28TXNCTK/ulx2LSgI694qLh5VTvLmYamHGa32Mkbn2GtlhyBFbfjMO+YueWmRUBkt9xnGBJI4lJAjbOefnrA==; 25:q8Scw+xTkhTCzEDVh4MzPXJ1mJjjHoTObtcCX78weDSRbPLa49SAgj3k5ufLQJX+pBsjX27hyOnsfKXTMLdgbWDLyVxQJkw6RE3TgDivPOfqnPO6gE7Jvpdb01WgQLC+6Au6Oso8FAZH7cnT0PGB4jbU6iuXBAVMqWSHy2d9X+zlOenbmWXWmGrYTnfPZfhe8JRrhRHg02MTWGNyGD1/LKlqndmyPWzj80B7GjslKT6RkOhk57/q+XnnVqsDP0xHGgnIOO3T977+F/RhZ/6JBU7qppryQFg20qTV0NQ7KHSP5/63DErw8fIa/khTR0NUvBVIKBU7iKIrvFBUYPfw5n/6Cft0ecASl85M7DcTHhXHk5GK23FwwCc7tYuJ75DlXkPlL7UAzJ82QkIM4ZYRFKC0C3FGa7mhnLJwKM+goJA= X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(8251501002); SRVR:CY1PR0301MB1180; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1180; 20:VQq5ndXx3p0oKhbfB6EEp/WHC5WVNajMFik2Nl1mA0+XdKW07KcXgDD7foP09gDseqW18Hr+KBg921Wq4/XvEnwtoQChoP5CqucD5LdvFM61vzG2fNwbahTfepB4HKeo3WkAEkhmpBTFjqM4tvQA1WTmwUMzkNamZCfofYhrFQjI+Y31SN0GRAt7YW3/tFvNm6hVaZNorrQdhmKkOvsOGN+brxqxAOutMUjgdJpEREu7MM4O0KIDdFGbp++YMF9+aSPFMtBXo+wwnddZWqxAQzoLq/4quNO5mClz6A5u2w0jxDqLhr9p3JNhgHBQGthv1riXyed/T1L4e7H2F77/FRocyLHTGuY7vDTt6dMSwW0X/n2LGUclR5p6CyntlYMJMeyP9ol+hZ5pQ2hpXx/He/gsdPOBuNS0SpGQRV/o/pI9RHcpZKCokNxI/IbNp56CvhCIEdhOyQhwmJ30/EsAreawt04DJTB0/Vy2CSV3TnDDhh1IjiQrtzEmNHelBvWA X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(166708455590820)(232431446821674); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(13023025)(13017025)(8121501046)(13018025)(13015025)(13024025)(3002001)(10201501046)(6055026); SRVR:CY1PR0301MB1180; BCL:0; PCL:0; RULEID:; SRVR:CY1PR0301MB1180; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1180; 4:TpoedPTvTynUzocElr2HqWFG26dnX3Fb4oID1HJMR8q5VSkLZhVyboapJxdPPWXnsbFSY4H570C5AGyry46oidtNbu9zFtmqZ/c11uHTzX6pBMjmM/OeumTCJbeisQ5ivtpAW9Mh8+XJn9MbZvw6DyIUb5gZ/FPHMZHtXgnSUdkey6NfkiwRCbP5wcO8Cc5drcYGfrHm4Hn0QI2FnVyZb0bkurgZgNHILIN0trCvDSEN1/PYVEpMeHtPd7yuHdLhvQYjhKHAR8gLt4csiidwgIKExM+jxDTi1Le55PrYkixOMASXbN0a7dvojTE5fpsOuxFfuFcUVC5Y65/OTfo4L8LLsLtHmi+sqDgdwYia/y786RiRfo8lgDjfJq2wm/hTFKMXT5/PokGpaaCHttYaZBz2/xG87yrz7akBbydClDg8znMhJV0QyXjqwe4peattm/SCw1LPCCYUTyve83GZPc1iGpMdH3J8QUrXWLbrEWDIU/8JF3mmtEW1Si+ZG0fu72rcGuqBPrcVKlKECuxs0k2dRNm5xPvEFdLyrvH4he69zn1ugB9EkLNKogUdA/Fy X-Forefront-PRVS: 0994F5E0C5 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB1180; 23:ytx5Jn9zjpABQMpDb+eY3ZBc0y/G4rsS7+Qh7r4?= =?us-ascii?Q?nZdH6au/UEH8vNzjTueh20wVaUn3vzfTXb/QahUpLdlXT0Swa5HY47wWPFYJ?= =?us-ascii?Q?jU0vW98K+0b8NVQVWMCkDnZCJ6xSupVjJewgW/2eI1wn+QtDzOqFnyQtci5S?= =?us-ascii?Q?HJ+2mNpoz3JeXb/F78oQvufgJ62T99aV9V1Ay93W+2i8g4hKwnuHWQSa8klZ?= =?us-ascii?Q?2zu9iTfif1D+UvwjDqhSuvIOTGyIds0CNv+3IsbcdwjsEQIeFNIJGy9E09vh?= =?us-ascii?Q?GVBUmsbGJ+atAxZXgzXA77LbNXwauecSFphzayuohp5TW2Kpdtuf7r5vmHFF?= =?us-ascii?Q?82fE6FE25f12Qj8qzsOAceLFdpNyTPKTpGXp54cNVDbbXWY3rif7fn38mJKV?= =?us-ascii?Q?ykmsPq67O/PEBc9QUhL9i88FmCN+ksy7d8LvtNNSYIa3jxbNPMK5Qir/Xhyv?= =?us-ascii?Q?lOhl5ikvVZ7fevVjw4vwv2tYurUFZxrojEUiswFdTTGsB2tyWaNFcusx9BiB?= =?us-ascii?Q?pUuxtKzie2aLFceJ/QUnlMa09tZOHwmz6+uz1lbztK6JevQqJ7kLlsvk5Qi+?= =?us-ascii?Q?U0/AjDVq67CgQ59Sr+K+mc7tAe1FNblwyPOd9k/P82boDL1H6StV/aAdzX6j?= =?us-ascii?Q?NLEiL5ejPUWJ+qyBlYV+AfZzIoP/iuqQlVHzMzkZj5tMNQ6d2FPUZo4pXysK?= =?us-ascii?Q?5pSzHucwCSS5sYZElnDZ0yIePrX+OmEuk+JD6kAjdjHei5+99zghXZN0XQS1?= =?us-ascii?Q?JJelINAKV68gE2goRQNo0PqRH+AeyNxaPDw/kF1NlEWN6T6kw36CP+myW9Ri?= =?us-ascii?Q?ipFuI7Ognz1yq+y1ijY64FL8LuSPbk+RjRoluO266GYvtZ7yBwU2ndz2P6Vn?= =?us-ascii?Q?HijMkf5GRZOcABCXGCPteLSMhLrE3/KisuwHDYQFhw/BKkp3VqNrmHzwUyUE?= =?us-ascii?Q?LeqDnhjLuZchPZDIPggan8CAi0ozcS0p2baLb/MBISJQ0ZYICDzGF9c3qPia?= =?us-ascii?Q?jm3/IDbEehVNqx7FzrLfqjTuuX/hYkHnMWxBOXiTLMlVxaM8J1ry1NWK82Yp?= =?us-ascii?Q?oXZishxTEoC5WqXtFmkjPTTdXH29AmSNzV3Uqkobpf5pcADGpWN4+IW+j5fE?= =?us-ascii?Q?O+hABsPu0dg4=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1180; 6:jt4nCcWo5526uCAw2sLIF89vEGKctTdXuy1c3DYny+pmG0t3VmbAbkqVhvQA3M2mB8uZ8vsdIiRoq+aCc1Wpnn3++A36vrGSXYI/WKf3V+ESIr+tyLcKiG4MQp9xmGJGuIaVoqwO8qprj2zW+mKv7fldwhHVNpDQwLsybNwWAsPr0aQQh51TJEAVyH8iwYCQS9ee1/YbQ+O/HRTayHwRsvlnsbkj0OSry1gMgrJFW54J7TGrE6afFrG9FNdKLHoWdWCAj2LV0GH7OP0I5HJL4/o54mnorU7pKbc8sDfkm4i/K3MeFZZfh89dej2Zsgkb4vpFb+Ub4JmEzaSKLsMJ98VuTQDNWoghx6iG7I+nZX8=; 5:AY45rP3RWDtbyVE1qrr7ELY5I8Hyjf/tATI8RgBaw0VppuptA+wOHDfDCaIBYJ62bJlrg/Gfx+sKi8SZksAb53+2MJklkvqOO35Ef06pTEsfBWlAwz4+i5hRF8+o/MBzW4dafO4zmZkQz1pPBM8Xgw==; 24:JCJM85faEkuZBummGBPs8TWrRrcfqqnEhV07IS1645CONx44TmhUgm0RT0dcur9LDmcjjXl52wB16ocOixFZUiTGs6Rbux5clKWj4PNjWwY=; 7:GKmBr4P4hmMJZ6GJpjxw/0gAWiITbxGTgyD6Ept2S/KAzq5lIAJ2XazNAcuUITBk5f80XZqzmoHkijsMEdIg9bb11uqyhwifYE0gG1vUoe77GmTmCqh9gkwKCL2kTTPsLaxp7DVCIntC5vcojMsYaumjzY+NX88AnFsL+QH7i195i2HotW1e91hsF5iJ/wt9pICZO15hp9hC9wuzAwATa5RW6LjAroLAYpWwPTilWzuJcZn5psEdEzbMknCrzxiz0EdUk2laUHtqyq/cxwRuag== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: analog.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2016 10:27:37.5716 (UTC) X-MS-Exchange-CrossTenant-Id: eaa689b4-8f87-40e0-9c6f-7228de4d754a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=eaa689b4-8f87-40e0-9c6f-7228de4d754a; Ip=[137.71.25.57]; Helo=[nwd2mta2.analog.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0301MB1180 Cc: Paul Cercueil Subject: [Buildroot] [PATCH] libiio: Bump version to 0.7 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The two previous patches have been merged upstream, so they have been deleted here. Another patch (picked from upstream) has been added to fix the build with thread-less toolchains. Libiio v0.7 provides two new backends, a USB backend (using libusb-1.0) and a serial backend (using libserialport). Additionally, it is now possible to compile libiio with thread-less toolchains. In that case, thread safety is disabled. Signed-off-by: Paul Cercueil Reviewed-by: Romain Naour --- ...l2-detection-try-first-the-CMake-module-f.patch | 43 ---------------------- ...t-include-pthread.h-if-NO_THREADS-is-defi.patch | 26 +++++++++++++ ...IIOD-Link-pthread-with-no-network-backend.patch | 30 --------------- package/libiio/Config.in | 31 ++++++++++++++-- package/libiio/libiio.hash | 4 +- package/libiio/libiio.mk | 23 ++++++++++-- 6 files changed, 74 insertions(+), 83 deletions(-) delete mode 100644 package/libiio/0001-cmake-libxml2-detection-try-first-the-CMake-module-f.patch create mode 100644 package/libiio/0001-lock.c-Don-t-include-pthread.h-if-NO_THREADS-is-defi.patch delete mode 100644 package/libiio/0002-IIOD-Link-pthread-with-no-network-backend.patch diff --git a/package/libiio/0001-cmake-libxml2-detection-try-first-the-CMake-module-f.patch b/package/libiio/0001-cmake-libxml2-detection-try-first-the-CMake-module-f.patch deleted file mode 100644 index 17fbdab..0000000 --- a/package/libiio/0001-cmake-libxml2-detection-try-first-the-CMake-module-f.patch +++ /dev/null @@ -1,43 +0,0 @@ -From b613e0fe7999cfff9efb646eb388ea1e58952e30 Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Thu, 14 Apr 2016 12:59:27 -0400 -Subject: [PATCH] cmake: libxml2 detection: try CMake module from libxml2 - -Libxml2 >=2.9.2 provides its own CMake module, so check for it before -falling back on the CMake's module FindLibXml2.cmake. - -Updated for v0.6 by: Matt Fornero - -Signed-off-by: Samuel Martin -Signed-off-by: Matt Fornero ---- - CMakeLists.txt | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 70f61f0..4a4209b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -143,7 +143,18 @@ if(WITH_NETWORK_BACKEND) - endif() - - if (NEED_LIBXML2) -- include(FindLibXml2) -+ # Since libxml2-2.9.2, libxml2 provides its own LibXml2-config.cmake, with all -+ # variables correctly set. -+ # So, try first to find the CMake module provided by libxml2 package, then fallback -+ # on the CMake's FindLibXml2.cmake module (which can lack some definition, especially -+ # in static build case). -+ find_package(LibXml2 QUIET NO_MODULE) -+ if(DEFINED LIBXML2_VERSION_STRING) -+ set(LIBXML2_FOUND ON) -+ set(LIBXML2_INCLUDE_DIR ${LIBXML2_INCLUDE_DIRS}) -+ else() -+ include(FindLibXml2) -+ endif() - - if (NOT LIBXML2_FOUND) - message(SEND_ERROR "The selected backends require libxml2 to be installed") --- -1.7.10.4 - diff --git a/package/libiio/0001-lock.c-Don-t-include-pthread.h-if-NO_THREADS-is-defi.patch b/package/libiio/0001-lock.c-Don-t-include-pthread.h-if-NO_THREADS-is-defi.patch new file mode 100644 index 0000000..fd029cc --- /dev/null +++ b/package/libiio/0001-lock.c-Don-t-include-pthread.h-if-NO_THREADS-is-defi.patch @@ -0,0 +1,26 @@ +From d052d263600549979a6219a59e85af80eeafc6d2 Mon Sep 17 00:00:00 2001 +From: Paul Cercueil +Date: Tue, 5 Jul 2016 12:12:41 +0200 +Subject: [PATCH] lock.c: Don't include if NO_THREADS is defined + +Signed-off-by: Paul Cercueil +--- + lock.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lock.c b/lock.c +index 39248ab..00eb9d9 100644 +--- a/lock.c ++++ b/lock.c +@@ -18,7 +18,7 @@ + + #ifdef _WIN32 + #include +-#else ++#elif !defined(NO_THREADS) + #include + #endif + +-- +2.8.1 + diff --git a/package/libiio/0002-IIOD-Link-pthread-with-no-network-backend.patch b/package/libiio/0002-IIOD-Link-pthread-with-no-network-backend.patch deleted file mode 100644 index df11a49..0000000 --- a/package/libiio/0002-IIOD-Link-pthread-with-no-network-backend.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 8dcb6c3f60123511d77b9fc7e4e22ae710e7d2f4 Mon Sep 17 00:00:00 2001 -From: Matthew Fornero -Date: Wed, 8 Jun 2016 20:03:56 -0400 -Subject: [PATCH] IIOD: Link pthread with no network backend - -If iiod is built without the network backend, CMake will not link in -pthreads. Update the CMake configuration to accomodate this case. - -Signed-off-by: Matthew Fornero ---- - CMakeLists.txt | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 70f61f0..20fa9f1 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -56,6 +56,9 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux") - if (WITH_IIOD AND NOT WITH_LOCAL_BACKEND) - message(SEND_ERROR "IIOD can only be enabled if the local backend is enabled") - endif() -+ if (WITH_IIOD) -+ set(NEED_THREADS 1) -+ endif() - endif() - - option(ENABLE_IPV6 "Define if you want to enable IPv6 support" ON) --- -1.7.10.4 - diff --git a/package/libiio/Config.in b/package/libiio/Config.in index 28a43f9..e7a5d18 100644 --- a/package/libiio/Config.in +++ b/package/libiio/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_LIBIIO bool "libiio" - select BR2_PACKAGE_LIBIIO_LOCAL_BACKEND if !BR2_PACKAGE_LIBIIO_NETWORK_BACKEND + select BR2_PACKAGE_LIBIIO_LOCAL_BACKEND if !BR2_PACKAGE_LIBIIO_XML_BACKEND help Libiio is a library to ease the development of software interfacing Linux Industrial I/O (IIO) devices. @@ -15,17 +15,40 @@ config BR2_PACKAGE_LIBIIO_LOCAL_BACKEND help Enable the local backend of the library. +config BR2_PACKAGE_LIBIIO_XML_BACKEND + bool "XML backend" + select BR2_PACKAGE_LIBXML2 + default y + help + Enable the XML backend of the library. + config BR2_PACKAGE_LIBIIO_NETWORK_BACKEND bool "Network backend" - depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_LIBXML2 + depends on BR2_PACKAGE_LIBIIO_XML_BACKEND default y help Enable the network backend of the library. -comment "IIO Network backend needs a toolchain w/ threads" +config BR2_PACKAGE_LIBIIO_USB_BACKEND + bool "USB backend" + depends on BR2_TOOLCHAIN_HAS_THREADS # from libusb + depends on BR2_PACKAGE_LIBIIO_XML_BACKEND + select BR2_PACKAGE_LIBUSB + default y + help + Enable the USB backend of the library. + +comment "The USB backend needs a toolchain w/ threads" depends on !BR2_TOOLCHAIN_HAS_THREADS +config BR2_PACKAGE_LIBIIO_SERIAL_BACKEND + bool "Serial backend" + depends on BR2_PACKAGE_LIBIIO_XML_BACKEND + select BR2_PACKAGE_LIBSERIALPORT + default y + help + Enable the serial backend of the library. + config BR2_PACKAGE_LIBIIO_IIOD bool "IIO Daemon" select BR2_PACKAGE_LIBIIO_LOCAL_BACKEND diff --git a/package/libiio/libiio.hash b/package/libiio/libiio.hash index da42c21..f15182a 100644 --- a/package/libiio/libiio.hash +++ b/package/libiio/libiio.hash @@ -1,2 +1,2 @@ -# From https://github.com/analogdevicesinc/libiio/archive/v0.6/ -sha256 efd3b4ebdba01dd2bfbdce8e222356b4fec2b96daab14f99691b5c1c9089e466 libiio-0.6.tar.gz +# From https://github.com/analogdevicesinc/libiio/archive/v0.7/ +sha256 c2b02f1cb51870db52368fdaa8087dc2a4ec43f2bc3c3514d8214952f14c3f39 libiio-0.7.tar.gz diff --git a/package/libiio/libiio.mk b/package/libiio/libiio.mk index 6479e6f..3cbfdd6 100644 --- a/package/libiio/libiio.mk +++ b/package/libiio/libiio.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBIIO_VERSION = 0.6 +LIBIIO_VERSION = 0.7 LIBIIO_SITE = $(call github,analogdevicesinc,libiio,v$(LIBIIO_VERSION)) LIBIIO_INSTALL_STAGING = YES LIBIIO_LICENSE = LGPLv2.1+ @@ -12,14 +12,29 @@ LIBIIO_LICENSE_FILES = COPYING.txt LIBIIO_CONF_OPTS = -DENABLE_IPV6=ON \ -DWITH_LOCAL_BACKEND=$(if $(BR2_PACKAGE_LIBIIO_LOCAL_BACKEND),ON,OFF) \ + -DWITH_NETWORK_BACKEND=$(if $(BR2_PACKAGE_LIBIIO_NETWORK_BACKEND),ON,OFF) \ -DWITH_TESTS=$(if $(BR2_PACKAGE_LIBIIO_TESTS),ON,OFF) \ -DWITH_DOC=OFF -ifeq ($(BR2_PACKAGE_LIBIIO_NETWORK_BACKEND),y) +ifeq ($(BR2_PACKAGE_LIBIIO_XML_BACKEND),y) LIBIIO_DEPENDENCIES += libxml2 -LIBIIO_CONF_OPTS += -DWITH_NETWORK_BACKEND=ON +LIBIIO_CONF_OPTS += -DWITH_XML_BACKEND=ON else -LIBIIO_CONF_OPTS += -DWITH_NETWORK_BACKEND=OFF +LIBIIO_CONF_OPTS += -DWITH_XML_BACKEND=OFF +endif + +ifeq ($(BR2_PACKAGE_LIBIIO_USB_BACKEND),y) +LIBIIO_DEPENDENCIES += libusb +LIBIIO_CONF_OPTS += -DWITH_USB_BACKEND=ON +else +LIBIIO_CONF_OPTS += -DWITH_USB_BACKEND=OFF +endif + +ifeq ($(BR2_PACKAGE_LIBIIO_SERIAL_BACKEND),y) +LIBIIO_DEPENDENCIES += libserialport +LIBIIO_CONF_OPTS += -DWITH_SERIAL_BACKEND=ON +else +LIBIIO_CONF_OPTS += -DWITH_SERIAL_BACKEND=OFF endif ifeq ($(BR2_PACKAGE_LIBIIO_IIOD),y)