From patchwork Sun Apr 29 19:36:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 134682 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp3038124lji; Sun, 29 Apr 2018 12:37:57 -0700 (PDT) X-Google-Smtp-Source: AB8JxZr/IZGx9Iw3EbDuX9nUdiqzw7hL14PhH8UP0Jz1CM1iYf/eoUN/ZW98wF2curIfbd+Cidee X-Received: by 2002:a17:902:bf41:: with SMTP id u1-v6mr10079031pls.257.1525030677517; Sun, 29 Apr 2018 12:37:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525030677; cv=none; d=google.com; s=arc-20160816; b=f5XPi/spsBEJCNQhIXY5y/5icr7u/eFWgDNYpLvOmJ/YWUKze11F3a6Hyo6DTFIHIC c+x+VmU2vg2y4hXkkORMHJxD3CCRC5pNogG8pcWQXcLGwfBbn/3zbg3NwvUgPYLY/cDs +TSpqGAMdeVlAclNhfMwbqSmpzr+Cp8C+tGII8oHfcJso0ESZlRVwFCroBTk/1Mz3xis t6UCo2P0eI6CCwTQU8DiQHY1acKMuaZ4aMg5dZvjUIJMvpJntuhIj5mQrgEWFPCceR0W 3Xt9oPWIGWtsEYrEMK2vgKvUm0DXKtEo+WNgMtwhI3Xm0DvAQfHdjeh+ULvUXrhI4zJP 8R9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=VZ429I0Ljtc9wrSZ1DpiU3ob1gm3o5nxtOdBBr+Bwyo=; b=a4lWeVSMtvtqouRcLPOpRuwi+e86gtaGoW80Es0iHT1Yddz5gRVmxQliC9lJouxqLq edcyedVA4IKlbmr4jxOjcqplgaOspnjbPvGk15QtbqJVDYv50WRG4SezHYJ5Zq82EJoV KqQHy+nMkiv3lmQm5+//HDsrx0FGGMyfSyIacp57e5o/f2hoUOdg5X7YWrtU/681kpXY 4DfkmFEaXEK2YQt6eRQSdub/3vjmGD/oZmpMIWfqrX67W4XSG9+tLLjfs/gHgZuBdTl6 Ny6AvcnKc6Uh0m3rj+uYLJh80LIMIUblEVYpV0nv6jX7tMysUdNlMY2bOF2icvlMq5QD k1Cg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=rxNy8oQf; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id e29-v6si2818348pga.573.2018.04.29.12.37.57; Sun, 29 Apr 2018 12:37:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=rxNy8oQf; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id F1F46745F0; Sun, 29 Apr 2018 19:36:40 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by mail.openembedded.org (Postfix) with ESMTP id 5AA20745AE for ; Sun, 29 Apr 2018 19:36:34 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id o76so5129330pfi.5 for ; Sun, 29 Apr 2018 12:36:35 -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:in-reply-to:references; bh=2bPRJcZIlKFvDF1OnT5ZG6LP5ZKdlq4/cHfpS1ectak=; b=rxNy8oQf7BHcS+XDqF3FUXohnhaCwtCBf+d6MNCP3P0iX3OjI5NHcvTHhpytFnFRxc igMNvkXFtRk8RtDs70Gev+LNAMPgN6+gcFFvqhG7yvRC+4Bu3oWwGV5seUQ6mMb/yecX Zoq3g7bysueWGXnl+TNhhy8JP4WCxWWeT6vTeGRIoCsfOIHbGVOrfEMsgO7XaVlOrLEQ vUOYCxr4CVYYb+W8eQioUthTFR7q0LmFCa9agYEsllcw+sA0SwFJ1zngxclg4waQmXnm 549+8gAf25GRRCv5jG857dQAH14r+v3VYXBrYVFDDdM8xB0IkT/tZol8oqFSbgAa8dQ2 dcUw== 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:in-reply-to :references; bh=2bPRJcZIlKFvDF1OnT5ZG6LP5ZKdlq4/cHfpS1ectak=; b=MLkINs2TzYToDirmYQ6JqVyK6Y/2mQKfrx+BA6t4WS4OPbNL/5IhdmutoWkPYiI8Mk 6olwRVHmIvTl3n0kc9w2caCd06o1etSeDw/LV60romDpxyXpBgdf9eKIoTMZO+qGVeLW fbHzgHGcWeJbAg7/T3SQdJFFPgANor7qaXtkndL+QMgVt4ntNOh+19n5YsUsWttqKZaS QXBRoDZdw9Xcrh1JbS0TEifWMD7eik8CdIDQQr7/gl1+VhTh/W0k0BIglcglgjWVAinT ahXcwv6wpUnteTI4Z8pMKdZO6DM1Lz9zOeHtSXL5VpTmJKXYLZXzJNAr5IM7/iXq83/H 5FOQ== X-Gm-Message-State: ALQs6tA+YBR5dyjD0XP6fqMLEaUVmZzWScTb3iIcYbfS9nlGtQL6vNd8 KtkWSNs3hNBacWpdn1xtA74jMw== X-Received: by 2002:a17:902:1a6:: with SMTP id b35-v6mr9979555plb.80.1525030594995; Sun, 29 Apr 2018 12:36:34 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8880:466c::ddd5]) by smtp.gmail.com with ESMTPSA id 125sm11960737pfc.145.2018.04.29.12.36.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 29 Apr 2018 12:36:34 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Sun, 29 Apr 2018 12:36:02 -0700 Message-Id: X-Mailer: git-send-email 2.17.0 In-Reply-To: References: Subject: [OE-core] [PATCH 15/24] libnsl: Upgrade to tip beyond 1.2.0 release X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- .../0001-include-sys-cdefs.h-explicitly.patch | 68 ------------------- ...de-stdint.h-for-uintptr_t-definition.patch | 27 -------- .../0002-Define-glibc-specific-macros.patch | 57 ---------------- meta/recipes-extended/libnsl/libnsl2_git.bb | 8 +-- 4 files changed, 2 insertions(+), 158 deletions(-) delete mode 100644 meta/recipes-extended/libnsl/libnsl2/0001-include-sys-cdefs.h-explicitly.patch delete mode 100644 meta/recipes-extended/libnsl/libnsl2/0001-nis_call.c-Include-stdint.h-for-uintptr_t-definition.patch delete mode 100644 meta/recipes-extended/libnsl/libnsl2/0002-Define-glibc-specific-macros.patch -- 2.17.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-extended/libnsl/libnsl2/0001-include-sys-cdefs.h-explicitly.patch b/meta/recipes-extended/libnsl/libnsl2/0001-include-sys-cdefs.h-explicitly.patch deleted file mode 100644 index bd647ac55e..0000000000 --- a/meta/recipes-extended/libnsl/libnsl2/0001-include-sys-cdefs.h-explicitly.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 508a0ff690dfebc17c4f55a5f81824ed549bed66 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 18 Apr 2017 09:13:33 -0700 -Subject: [PATCH 1/2] include sys/cdefs.h explicitly - -glibc includes this header indirectly but not musl - -Signed-off-by: Khem Raj ---- -Upstream-Status: Pending - - src/rpcsvc/nis.h | 1 + - src/rpcsvc/nislib.h | 1 + - src/rpcsvc/ypclnt.h | 1 + - src/rpcsvc/ypupd.h | 1 + - 4 files changed, 4 insertions(+) - -diff --git a/src/rpcsvc/nis.h b/src/rpcsvc/nis.h -index 933c4d9..88cbca0 100644 ---- a/src/rpcsvc/nis.h -+++ b/src/rpcsvc/nis.h -@@ -32,6 +32,7 @@ - #ifndef _RPCSVC_NIS_H - #define _RPCSVC_NIS_H 1 - -+#include - #include - #include - #include -diff --git a/src/rpcsvc/nislib.h b/src/rpcsvc/nislib.h -index a59c19b..a53fab3 100644 ---- a/src/rpcsvc/nislib.h -+++ b/src/rpcsvc/nislib.h -@@ -19,6 +19,7 @@ - #ifndef __RPCSVC_NISLIB_H__ - #define __RPCSVC_NISLIB_H__ - -+#include - #include - - __BEGIN_DECLS -diff --git a/src/rpcsvc/ypclnt.h b/src/rpcsvc/ypclnt.h -index fe43fd4..a686b61 100644 ---- a/src/rpcsvc/ypclnt.h -+++ b/src/rpcsvc/ypclnt.h -@@ -20,6 +20,7 @@ - #ifndef __RPCSVC_YPCLNT_H__ - #define __RPCSVC_YPCLNT_H__ - -+#include - #include - - /* Some defines */ -diff --git a/src/rpcsvc/ypupd.h b/src/rpcsvc/ypupd.h -index d07fd4d..2c57301 100644 ---- a/src/rpcsvc/ypupd.h -+++ b/src/rpcsvc/ypupd.h -@@ -33,6 +33,7 @@ - #ifndef __RPCSVC_YPUPD_H__ - #define __RPCSVC_YPUPD_H__ - -+#include - #include - - #include --- -2.12.2 - diff --git a/meta/recipes-extended/libnsl/libnsl2/0001-nis_call.c-Include-stdint.h-for-uintptr_t-definition.patch b/meta/recipes-extended/libnsl/libnsl2/0001-nis_call.c-Include-stdint.h-for-uintptr_t-definition.patch deleted file mode 100644 index e9ae517107..0000000000 --- a/meta/recipes-extended/libnsl/libnsl2/0001-nis_call.c-Include-stdint.h-for-uintptr_t-definition.patch +++ /dev/null @@ -1,27 +0,0 @@ -From d71cbeb3b76e54778a4d5eec6d387cce653537ca Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 9 Jun 2017 09:49:35 -0700 -Subject: [PATCH] nis_call.c: Include stdint.h for uintptr_t definition - -Signed-off-by: Khem Raj ---- -Upstream-Status: Pending - - src/nisplus/nis_call.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/nisplus/nis_call.c b/src/nisplus/nis_call.c -index 1a2b90c..1dc982d 100644 ---- a/src/nisplus/nis_call.c -+++ b/src/nisplus/nis_call.c -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include - #include - #include --- -2.13.1 - diff --git a/meta/recipes-extended/libnsl/libnsl2/0002-Define-glibc-specific-macros.patch b/meta/recipes-extended/libnsl/libnsl2/0002-Define-glibc-specific-macros.patch deleted file mode 100644 index 75fda4b0f0..0000000000 --- a/meta/recipes-extended/libnsl/libnsl2/0002-Define-glibc-specific-macros.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 60282514ea01af004d7f9e66dd3929223b7d2e7b Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 18 Apr 2017 09:16:12 -0700 -Subject: [PATCH 2/2] Define glibc specific macros - -Check and define -rawmemchr, __asprintf, __mempcpy, __strtok_r -__always_inline, TEMP_FAILURE_RETRY - -if not existing. Helps compiling with musl - -Signed-off-by: Khem Raj ---- -Upstream-Status: Pending - -diff --git a/src/rpcsvc/nis.h b/src/rpcsvc/nis.h -index 88cbca0..23fc20c 100644 ---- a/src/rpcsvc/nis.h -+++ b/src/rpcsvc/nis.h -@@ -57,6 +57,34 @@ __BEGIN_DECLS - * - */ - -+#ifndef rawmemchr -+#define rawmemchr(s,c) memchr((s),(size_t)-1,(c)) -+#endif -+ -+#ifndef __asprintf -+#define __asprintf asprintf -+#endif -+ -+#ifndef __mempcpy -+#define __mempcpy mempcpy -+#endif -+ -+#ifndef __strtok_r -+#define __strtok_r strtok_r -+#endif -+ -+#ifndef __always_inline -+#define __always_inline __attribute__((__always_inline__)) -+#endif -+ -+#ifndef TEMP_FAILURE_RETRY -+#define TEMP_FAILURE_RETRY(exp) ({ \ -+typeof (exp) _rc; \ -+ do { \ -+ _rc = (exp); \ -+ } while (_rc == -1 && errno == EINTR); \ -+ _rc; }) -+#endif - - #ifndef __nis_object_h - #define __nis_object_h --- -2.12.2 - diff --git a/meta/recipes-extended/libnsl/libnsl2_git.bb b/meta/recipes-extended/libnsl/libnsl2_git.bb index a539148caf..c6ba80c943 100644 --- a/meta/recipes-extended/libnsl/libnsl2_git.bb +++ b/meta/recipes-extended/libnsl/libnsl2_git.bb @@ -9,16 +9,12 @@ LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SECTION = "libs" DEPENDS = "libtirpc" -DEPENDS_append_libc-musl = " bsd-headers" -PV = "1.0.5+git${SRCPV}" +PV = "1.2.0+git${SRCPV}" -SRCREV = "dfa2f313524aff9243c4d8ce1bace73786478356" +SRCREV = "37c5ffe3038d42e9fa9ed232ad2cbca4d8f14681" SRC_URI = "git://github.com/thkukuk/libnsl \ - file://0001-include-sys-cdefs.h-explicitly.patch \ - file://0002-Define-glibc-specific-macros.patch \ - file://0001-nis_call.c-Include-stdint.h-for-uintptr_t-definition.patch \ " S = "${WORKDIR}/git"