From patchwork Fri May 29 13:49:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Joris OFFOUGA X-Patchwork-Id: 1300721 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=QbHGDDtU; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49YQt5225Dz9sSm for ; Fri, 29 May 2020 23:49:49 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 80497203AC; Fri, 29 May 2020 13:49:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MkhzpkhrCiQo; Fri, 29 May 2020 13:49:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id F269F20449; Fri, 29 May 2020 13:49:44 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id E97391BF5DF for ; Fri, 29 May 2020 13:49:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id ADEDD20449 for ; Fri, 29 May 2020 13:49:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id K+pH09Fg9yHB for ; Fri, 29 May 2020 13:49:42 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by silver.osuosl.org (Postfix) with ESMTPS id 49772203AC for ; Fri, 29 May 2020 13:49:42 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id x13so3704996wrv.4 for ; Fri, 29 May 2020 06:49:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=qVNu5cVX9lsUfzhNg1M9urrCmRR80i8AI8uNw+TdM/M=; b=QbHGDDtUu5VfvtkEQcSGIShycAAHIukJHPLiZk1qZSFSKB2j2rQcPCCs9YkYml568U gQnvPKYD9uEPYThyJzUEsS7EeCuc7deUuVj7SCYe8ckN3uCY2gNd2NKfxRhwTLzub7/y iAugEFlarO1An/jzuavkkq3+CcuHHfiYA+Wyi+sQbVCCnfpJuseX3x5y+OT0yiwXQGvc KOJDfI98m+eLbDXYUx1UFt4IC6ReFIEevx1KXyuEqlGbjkf1qNGOmS94sHVgad9bVG8t r87YtGPU6Jse0hERn/BbtvGGem8sB9x5DF7wXHvThpd5Kpv1aocKCd7sHHo8+CAHZFZS Oc8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=qVNu5cVX9lsUfzhNg1M9urrCmRR80i8AI8uNw+TdM/M=; b=EXQyoCSM4FBgCY8Sqk1IZj05I1SjtXE4uxcvqGKfEcKoA1zNp0MBNXtCiPJfE5YhKy t2e9noXScx50XGjo1dW75PKQJaLJKcBVIQOzx32JRZYL3YuYfq9Lf9AnuSGeh36GJ0EK bXEPIjospXtbVckNaq0hd4YTqwYS9dyCcLluuHCbn6o4CX2H+PAPXvbSZ8ftj4LrETDS f12A/nEgvkBlMYklXU44RxlZ2UAk8ufXvkZUa2xPsUYp4CAbkOnpzZPJWHvINDcw8ZWh CcyfAUwwRwB25nByCiSBEQtoUcdhtoNw3m67j6d5t9SOkqs4EKYqH404J8nzvBk1iXV8 VbYA== X-Gm-Message-State: AOAM530PlMAr/RsfVUxixbJaPkI9RLGOl3g8JBmihhpTNf0HWhgP1GKr khMQ8P7bCwDoTK7KfIz+91toSuBy X-Google-Smtp-Source: ABdhPJyJeoarLlYr74AcM1TgNheA4ZeRM8j3SEpqZ+v8ZC8g7+wL8EeeKnypp43eXx4+4OxlCxxYGA== X-Received: by 2002:a5d:4390:: with SMTP id i16mr8434428wrq.186.1590760180429; Fri, 29 May 2020 06:49:40 -0700 (PDT) Received: from XPS-15-7590.home ([2a01:cb19:16b:9900:687f:fe11:aef0:33fc]) by smtp.gmail.com with ESMTPSA id 40sm10544901wrc.15.2020.05.29.06.49.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 May 2020 06:49:39 -0700 (PDT) From: Joris Offouga To: buildroot@buildroot.org Date: Fri, 29 May 2020 15:49:27 +0200 Message-Id: <20200529134928.1407-1-offougajoris@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/2] package/c-periphery: bump version to 2.2.0 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Joris Offouga , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Since commit "cmake: add cmake build support" (https://github.com/vsergeev/c-periphery/commit/952e1e906a5d65b78932128af24b7dbb8cce2e9dvsergeev/c-periphery@d0a973c), c-periphery implement cmake build, so change generic-package instead of cmake-package The hash of the license file is updated due to an update in the copyright year: - Copyright (c) 2014-2019 vsergeev / Ivan (Vanya) A. Sergeev + Copyright (c) 2014-2029 vsergeev / Ivan (Vanya) A. Sergeev Signed-off-by: Joris Offouga --- .../0001-gpio.c-add-__USE_XOPEN-define.patch | 38 +++++++++++++++++++ package/c-periphery/c-periphery.hash | 4 +- package/c-periphery/c-periphery.mk | 16 +------- 3 files changed, 42 insertions(+), 16 deletions(-) create mode 100644 package/c-periphery/0001-gpio.c-add-__USE_XOPEN-define.patch diff --git a/package/c-periphery/0001-gpio.c-add-__USE_XOPEN-define.patch b/package/c-periphery/0001-gpio.c-add-__USE_XOPEN-define.patch new file mode 100644 index 0000000000..953165f6bd --- /dev/null +++ b/package/c-periphery/0001-gpio.c-add-__USE_XOPEN-define.patch @@ -0,0 +1,38 @@ +From 7864e15c95c4500fbd8f64fcd543c707202dc09e Mon Sep 17 00:00:00 2001 +From: Joris Offouga +Date: Fri, 29 May 2020 13:48:58 +0200 +Subject: [PATCH] gpio.c: add __USE_XOPEN define +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The code needs __USE_XOPEN for some poll() flags. + +Fix build with uclibc: +src/gpio.c: In function gpio_poll_multiple»: +src/gpio.c:242:61: error: «POLLRDNORM» undeclared (first use in this function) +(POLLPRI | POLLERR) : (POLLIN | POLLRDNORM); + ^ + +Signed-off-by: Joris Offouga +[Upstream Status: https://github.com/vsergeev/c-periphery/pull/24] +--- + src/gpio.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/gpio.c b/src/gpio.c +index b4039f1..5c48855 100644 +--- a/src/gpio.c ++++ b/src/gpio.c +@@ -13,6 +13,8 @@ + + #include + #include ++ ++#define __USE_XOPEN + #include + #include + #include +-- +2.20.1 + diff --git a/package/c-periphery/c-periphery.hash b/package/c-periphery/c-periphery.hash index 244f8f60f1..208ab5de97 100644 --- a/package/c-periphery/c-periphery.hash +++ b/package/c-periphery/c-periphery.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1c455c42b26818d199ac227cd19714f265623e15d363fdfdf47a2416a4165654 c-periphery-2.1.0.tar.gz -sha256 e7b9464cb8511f19ddb40f9cf52fe86b3dfe38b2faed9d7bbc3d5707677ffbe3 LICENSE +sha256 2c1714962f8e4a29ded69f3fc990f4e039162ac9d213a21062a4df9e105b83a4 c-periphery-2.2.0.tar.gz +sha256 7121a0a2ba36ed9388be2f1a916f0e3584d8e49cc7888fbcfcf83bab2a8bebef LICENSE diff --git a/package/c-periphery/c-periphery.mk b/package/c-periphery/c-periphery.mk index bb50434efa..67e637cfc7 100644 --- a/package/c-periphery/c-periphery.mk +++ b/package/c-periphery/c-periphery.mk @@ -4,7 +4,7 @@ # ################################################################################ -C_PERIPHERY_VERSION = 2.1.0 +C_PERIPHERY_VERSION = 2.2.0 C_PERIPHERY_SITE = $(call github,vsergeev,c-periphery,v$(C_PERIPHERY_VERSION)) C_PERIPHERY_INSTALL_STAGING = YES # only a static library @@ -12,16 +12,4 @@ C_PERIPHERY_INSTALL_TARGET = NO C_PERIPHERY_LICENSE = MIT C_PERIPHERY_LICENSE_FILES = LICENSE -define C_PERIPHERY_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -endef - -# There is no 'install' rule in the Makefile, so we handle things -# manually. -define C_PERIPHERY_INSTALL_STAGING_CMDS - $(INSTALL) -D -m 0644 $(@D)/periphery.a $(STAGING_DIR)/usr/lib/libc-periphery.a - mkdir -p $(STAGING_DIR)/usr/include/c-periphery/ - cp -dpfr $(@D)/src/*.h $(STAGING_DIR)/usr/include/c-periphery/ -endef - -$(eval $(generic-package)) +$(eval $(cmake-package))