From patchwork Mon Sep 14 22:40:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?J=C3=B6rg_Krause?= X-Patchwork-Id: 517582 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]) by ozlabs.org (Postfix) with ESMTP id 30D27140770 for ; Tue, 15 Sep 2015 08:41:02 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="key not found in DNS" (0-bit key; unprotected) header.d=embedded.rocks header.i=@embedded.rocks header.b=Enrplpg+; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 77CE295D27; Mon, 14 Sep 2015 22:41:01 +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 lsvgfNZ-pvix; Mon, 14 Sep 2015 22:41:00 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 40DF3961A7; Mon, 14 Sep 2015 22:41:00 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 418821C0FDB for ; Mon, 14 Sep 2015 22:40:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 3D5DD96109 for ; Mon, 14 Sep 2015 22:40:59 +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 ufZNRi7hxFYf for ; Mon, 14 Sep 2015 22:40:54 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mout01.posteo.de (mout01.posteo.de [185.67.36.65]) by hemlock.osuosl.org (Postfix) with ESMTPS id F0A7195D27 for ; Mon, 14 Sep 2015 22:40:53 +0000 (UTC) Received: from dovecot03.posteo.de (dovecot03.posteo.de [172.16.0.13]) by mout01.posteo.de (Postfix) with ESMTPS id 46D902106B for ; Tue, 15 Sep 2015 00:40:51 +0200 (CEST) Received: from mail.posteo.de (localhost [127.0.0.1]) by dovecot03.posteo.de (Postfix) with ESMTPSA id 3nFN2B5yVnz5vMJ for ; Tue, 15 Sep 2015 00:40:50 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail.embedded.rocks (Postfix) with ESMTP id 94F1DEE0C51; Tue, 15 Sep 2015 00:40:49 +0200 (CEST) Authentication-Results: mail.embedded.rocks (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=embedded.rocks DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embedded.rocks; h=content-transfer-encoding:content-type:content-type :mime-version:x-mailer:message-id:date:date:subject:subject:from :from:received:received; s=default; t=1442270438; x=1442875239; bh=fIpqgyRRpgGLTnWtsAhhVaWfdI52sUY6fX6tQQ7vN34=; b=Enrplpg+styv bEMmypZJMrNgcJLqwDpTU+4/W/150B7+EFGzXJimFGVrmByC7ILgB17jdI9UO57J XKm4uBZNgRU5gbArHAvdQlpkhfTZ3Q12IxAG9zBHXaggDcwIp7FgXUSO0Ci573QW mlz91wsIxQKkYi8YFNfLntOafjilKIxV+i04BuKr4t/TEPR5Y10bWn63wHJpSi8/ M4F7r0wQXm08iUxZi4/N84JwjR//hKQL94Khm7kGX6uY7U2BABhGrbJSEWc2q2wT f9ahl4aOmKUVQ48TaJiQpdb24OpgIjkLkvRA3oNFrRBmmLm/KCnb1GNrMu6kzdQr ou62MxLHEg== X-Virus-Scanned: Debian amavisd-new at mail.embedded.rocks Received: from mail.embedded.rocks ([127.0.0.1]) by localhost (mail.embedded.rocks [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id yVDWRP7PiaYR; Tue, 15 Sep 2015 00:40:38 +0200 (CEST) Received: from nzxt.fritz.box (x4d0cd9c1.dyn.telefonica.de [77.12.217.193]) (Authenticated sender: joerg.krause@embedded.rocks) by mail.embedded.rocks (Postfix) with ESMTPSA; Tue, 15 Sep 2015 00:40:38 +0200 (CEST) From: =?UTF-8?q?J=C3=B6rg=20Krause?= To: buildroot@buildroot.org Date: Tue, 15 Sep 2015 00:40:35 +0200 Message-Id: <1442270435-28287-1-git-send-email-joerg.krause@embedded.rocks> X-Mailer: git-send-email 2.5.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/lua-periphery: bump to version 1.0.6 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" Also remove patch 0001-fix-build-flags.patch. The uCLibc issue is fixed upstream. Add patch taken and slighly adopted from the c-periphery package to fix build issue with musl. Build was tested with an uCLibc toolchain and a musl toolchain. Signed-off-by: Jörg Krause --- ...Add-missing-header-for-musl-compatibility.patch | 34 ++++++++++++++++++++++ package/lua-periphery/0001-fix-build-flags.patch | 21 ------------- package/lua-periphery/lua-periphery.hash | 2 +- package/lua-periphery/lua-periphery.mk | 4 +-- 4 files changed, 37 insertions(+), 24 deletions(-) create mode 100644 package/lua-periphery/0001-Add-missing-header-for-musl-compatibility.patch delete mode 100644 package/lua-periphery/0001-fix-build-flags.patch diff --git a/package/lua-periphery/0001-Add-missing-header-for-musl-compatibility.patch b/package/lua-periphery/0001-Add-missing-header-for-musl-compatibility.patch new file mode 100644 index 0000000..22c748c --- /dev/null +++ b/package/lua-periphery/0001-Add-missing-header-for-musl-compatibility.patch @@ -0,0 +1,34 @@ +From 1d8cb0ad54099c3d7261aaa19a2c0786f16736d0 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sat, 8 Aug 2015 22:42:39 +0200 +Subject: [PATCH] Add missing header for musl compatibility + + is needed to get the definition of _IOC_SIZEBITS and +solve the following build failure: + +src/spi.c: In function 'spi_transfer': +src/spi.c:100:24: error: '_IOC_SIZEBITS' undeclared (first use in this function) + if (ioctl(spi->fd, SPI_IOC_MESSAGE(1), &spi_xfer) < 1) + +Signed-off-by: Thomas Petazzoni +[Port from c-periphery] +Signed-off-by: Jörg Krause +--- + src/spi.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lua-periphery/c-periphery/src/spi.c b/lua-periphery/c-periphery/src/spi.c +index 52a8d3d..1a6b17c 100644 +--- a/lua-periphery/c-periphery/src/spi.c ++++ b/lua-periphery/c-periphery/src/spi.c +@@ -16,6 +16,7 @@ + #include + + #include ++#include + #include + + #include "spi.h" +-- +2.5.0 + diff --git a/package/lua-periphery/0001-fix-build-flags.patch b/package/lua-periphery/0001-fix-build-flags.patch deleted file mode 100644 index 1ac220c..0000000 --- a/package/lua-periphery/0001-fix-build-flags.patch +++ /dev/null @@ -1,21 +0,0 @@ -Fix build flags to build properly with uClibc - -Building with -std=c99 -D_DEFAULT_SOURCE hides the struct timespec and -nanosleep() definitions from in uClibc. Work around that by -using -std=gnu99 instead. - -Signed-off-by: Thomas Petazzoni - -Index: b/lua-periphery/Makefile -=================================================================== ---- a/lua-periphery/Makefile -+++ b/lua-periphery/Makefile -@@ -16,7 +16,7 @@ - - ########################################################################### - --CFLAGS += -std=c99 -pedantic -D_DEFAULT_SOURCE -+CFLAGS += -std=gnu99 -pedantic - CFLAGS += -Wall -Wextra -Wno-unused-parameter $(DEBUG) -fPIC -I. $(LUA_CFLAGS) - LDFLAGS += -shared - diff --git a/package/lua-periphery/lua-periphery.hash b/package/lua-periphery/lua-periphery.hash index 39209df..7f6e63f 100644 --- a/package/lua-periphery/lua-periphery.hash +++ b/package/lua-periphery/lua-periphery.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 f94f4af342e531ff25b037b8b7c127db50b7464c0bbce4c5ea3b49fd215ada60 lua-periphery-1.0.5-2.src.rock +sha256 53762ed9b8a2edfcc5b4c535ef73e6a425f2577e036bb15994ca16a39b16ebab lua-periphery-1.0.6-1.src.rock diff --git a/package/lua-periphery/lua-periphery.mk b/package/lua-periphery/lua-periphery.mk index 541079f..48eba39 100644 --- a/package/lua-periphery/lua-periphery.mk +++ b/package/lua-periphery/lua-periphery.mk @@ -4,8 +4,8 @@ # ################################################################################ -LUA_PERIPHERY_VERSION_UPSTREAM = 1.0.5 -LUA_PERIPHERY_VERSION = $(LUA_PERIPHERY_VERSION_UPSTREAM)-2 +LUA_PERIPHERY_VERSION_UPSTREAM = 1.0.6 +LUA_PERIPHERY_VERSION = $(LUA_PERIPHERY_VERSION_UPSTREAM)-1 LUA_PERIPHERY_SUBDIR = lua-periphery LUA_PERIPHERY_LICENSE = MIT LUA_PERIPHERY_LICENSE_FILES = $(LUA_PERIPHERY_SUBDIR)/LICENSE