From patchwork Thu Dec 12 14:01:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giulio Benetti X-Patchwork-Id: 1208523 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.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=benettiengineering.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=aruba.it header.i=@aruba.it header.b="Ml3/tljh"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47Yb7g1x2Rz9sPc for ; Fri, 13 Dec 2019 01:01:32 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 5CB60882FF; Thu, 12 Dec 2019 14:01:30 +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 xfm0AN08sUjQ; Thu, 12 Dec 2019 14:01:28 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 2506588307; Thu, 12 Dec 2019 14:01:28 +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 11D361BF42E for ; Thu, 12 Dec 2019 14:01:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0F0CD88307 for ; Thu, 12 Dec 2019 14:01:26 +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 6vVLHpHiwQqu for ; Thu, 12 Dec 2019 14:01:23 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from smtpweb146.aruba.it (smtpweb146.aruba.it [62.149.158.146]) by whitealder.osuosl.org (Postfix) with ESMTP id 2DD74882F2 for ; Thu, 12 Dec 2019 14:01:22 +0000 (UTC) Received: from ubuntu.localdomain ([146.241.72.127]) by smtpcmd05.ad.aruba.it with bizsmtp id d21K210042kmWnm0121L4Q; Thu, 12 Dec 2019 15:01:20 +0100 From: Giulio Benetti To: buildroot@buildroot.org Date: Thu, 12 Dec 2019 15:01:17 +0100 Message-Id: <20191212140118.90730-2-giulio.benetti@benettiengineering.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191212140118.90730-1-giulio.benetti@benettiengineering.com> References: <20191212140118.90730-1-giulio.benetti@benettiengineering.com> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aruba.it; s=a1; t=1576159280; bh=NIHUSj7kGMeWpONS+R4R75LwFdi2ls96+f+WWt/7Z6M=; h=From:To:Subject:Date:MIME-Version; b=Ml3/tljhblPC/vWe7fPPIQQ6KKySVdn0GiqyZ5CaJQZoFeSz9H9T79qUoQfCzsJiS MGCKGOYfRb2KPIG7TEM48ez05nTfBq3Cj5lpv2O5tyYYPWvnO9zFsRyLLf+PPCJsK9 yFPr7PyyfRy6DR3cH+UrkN/KxF6iSuirTC/I0aPGGmXt2XautmNfV4fe0NscyGT+Sr Y7DmX8wsjbzJsibVGSqBjROxwVh/yvAQwl86a9nVoEQXK7cMQ9cVssj9FdBUemImub VLaEbmiWDG6PpF1/fhp29kaJX1w+XvTFP/tk+0j3X1RNZaCxdk43SnvmbSO/X6edYW UGHlAKea3gbmA== Subject: [Buildroot] [PATCH 1/2] package/libnss: fix build failure on RHEL 7 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: Joseph Kogut , Giulio Benetti Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" -DLINUX flag was passed to OS_CFLAGS instead of DEFINES, but OS_CFLAGS is only used when cross-compiling, not when native building. Add patch to fix build failure on RHEL 7 host by substituting OS_CFLAGS with DEFINES. Signed-off-by: Giulio Benetti --- Patch is pending upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1603398 --- ...-nsinstall.c-build-failure-on-RHEL-7.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 package/libnss/0005-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch diff --git a/package/libnss/0005-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch b/package/libnss/0005-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch new file mode 100644 index 0000000000..631d97d11f --- /dev/null +++ b/package/libnss/0005-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch @@ -0,0 +1,29 @@ +From 1ba8516045bc8a13fd72e1a85206a04b29d96758 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Thu, 12 Dec 2019 12:57:29 +0100 +Subject: [PATCH] Bug 1603398 - Fix nsinstall.c build failure on RHEL 7 + +In Linux.mk -DLINUX and -Dlinux must be passed to DEFINES, not +OS_CFLAGS. + +Signed-off-by: Giulio Benetti +--- + nss/coreconf/Linux.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/nss/coreconf/Linux.mk b/nss/coreconf/Linux.mk +index d07f8a3c5..4b45a6054 100644 +--- a/nss/coreconf/Linux.mk ++++ b/nss/coreconf/Linux.mk +@@ -132,7 +132,7 @@ endif + + OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -pipe -ffunction-sections -fdata-sections -DHAVE_STRERROR + ifeq ($(KERNEL),Linux) +- OS_CFLAGS += -DLINUX -Dlinux ++ DEFINES += -DLINUX -Dlinux + endif + OS_LIBS = $(OS_PTHREAD) -ldl -lc + +-- +2.20.1 + From patchwork Thu Dec 12 14:01:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giulio Benetti X-Patchwork-Id: 1208521 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.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=benettiengineering.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=aruba.it header.i=@aruba.it header.b="egfPfdV6"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47Yb7f5sz4z9sPL for ; Fri, 13 Dec 2019 01:01:32 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 21FE388600; Thu, 12 Dec 2019 14:01:30 +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 Coql+FjjmuHH; Thu, 12 Dec 2019 14:01:29 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 5C657887BC; Thu, 12 Dec 2019 14:01:29 +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 3BB7E1BF9BA for ; Thu, 12 Dec 2019 14:01:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 349E5887BC for ; Thu, 12 Dec 2019 14:01:26 +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 XZ571bVntNvr for ; Thu, 12 Dec 2019 14:01:24 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from smtpweb146.aruba.it (smtpweb146.aruba.it [62.149.158.146]) by hemlock.osuosl.org (Postfix) with ESMTP id E565888600 for ; Thu, 12 Dec 2019 14:01:23 +0000 (UTC) Received: from ubuntu.localdomain ([146.241.72.127]) by smtpcmd05.ad.aruba.it with bizsmtp id d21K210042kmWnm0121L5D; Thu, 12 Dec 2019 15:01:22 +0100 From: Giulio Benetti To: buildroot@buildroot.org Date: Thu, 12 Dec 2019 15:01:18 +0100 Message-Id: <20191212140118.90730-3-giulio.benetti@benettiengineering.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191212140118.90730-1-giulio.benetti@benettiengineering.com> References: <20191212140118.90730-1-giulio.benetti@benettiengineering.com> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aruba.it; s=a1; t=1576159282; bh=yjEaIqz5ZtpyT0ShbI94GSz0uqzp0nqMt4Br2UOttec=; h=From:To:Subject:Date:MIME-Version; b=egfPfdV63ehWqs8zJckYreoHYn17SHMn8VtpRuhZVkxDxToCWiiKOyUixGgFqGESY /G4tweFTCvdG2E4MurtiqAmlC1+EcFdQjG+P6eGbySgXc+Tutc7ccutFqlvO+gS3fU n453WpPQGL0cBYFr4qkWXmYkn1BZA4y0rL0+ENupa2Ze0+Ykazv8B74xnRujUr+eCo wHZcNM6CjJJ2k6itk+Qtqii6noPgwDHXfqyG80kYhexVRpsQ86Qe7zrGeqK/WvIL6o h9pqdYm4Lflb3QQY9wCPOcbhY7W/OR0so4Yz7VIlPel12JGRFaAPjLlzB215OSF7iN bMU938UJcerPw== Subject: [Buildroot] [PATCH 2/2] package/libnss: remove patch 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: Joseph Kogut , Giulio Benetti Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Remove uClibc fix patch since its change has been upstreamed despite the comment contained in patch. Signed-off-by: Giulio Benetti --- ... 0001-add-zlib-include-dir-variable.patch} | 0 package/libnss/0001-fix-uclibc-build.patch | 22 ------------------- ...uild-failure-due-to-missing-posix-s.patch} | 0 ...ix-PowerPc-build-sys-auxv.h-failure.patch} | 0 ...nsinstall.c-build-failure-on-RHEL-7.patch} | 0 5 files changed, 22 deletions(-) rename package/libnss/{0002-add-zlib-include-dir-variable.patch => 0001-add-zlib-include-dir-variable.patch} (100%) delete mode 100644 package/libnss/0001-fix-uclibc-build.patch rename package/libnss/{0003-Bug-1602288-Fix-build-failure-due-to-missing-posix-s.patch => 0002-Bug-1602288-Fix-build-failure-due-to-missing-posix-s.patch} (100%) rename package/libnss/{0004-Bug-1602743-Fix-PowerPc-build-sys-auxv.h-failure.patch => 0003-Bug-1602743-Fix-PowerPc-build-sys-auxv.h-failure.patch} (100%) rename package/libnss/{0005-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch => 0004-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch} (100%) diff --git a/package/libnss/0002-add-zlib-include-dir-variable.patch b/package/libnss/0001-add-zlib-include-dir-variable.patch similarity index 100% rename from package/libnss/0002-add-zlib-include-dir-variable.patch rename to package/libnss/0001-add-zlib-include-dir-variable.patch diff --git a/package/libnss/0001-fix-uclibc-build.patch b/package/libnss/0001-fix-uclibc-build.patch deleted file mode 100644 index a9e84c264b..0000000000 --- a/package/libnss/0001-fix-uclibc-build.patch +++ /dev/null @@ -1,22 +0,0 @@ -Fix build with uClibc-ng - -The elf.h header in uClibc-ng is missing the AT_HWCAP2 definition. Add it in -the code. - -Signed-off-by: Baruch Siach ---- -Upstream status: Not upstreamable; uClibc needs to update elf.h - -diff -Nuar nss-3.38.orig/nss/lib/freebl/blinit.c nss-3.38/nss/lib/freebl/blinit.c ---- nss-3.38.orig/nss/lib/freebl/blinit.c 2018-06-21 12:24:45.000000000 +0300 -+++ nss-3.38/nss/lib/freebl/blinit.c 2018-06-26 13:13:55.636434720 +0300 -@@ -100,6 +100,9 @@ - defined(__GNUC__) && __GNUC__ >= 2 && defined(__ELF__) - #include - extern unsigned long getauxval(unsigned long type) __attribute__((weak)); -+#ifndef AT_HWCAP2 -+#define AT_HWCAP2 26 -+#endif - #else - static unsigned long (*getauxval)(unsigned long) = NULL; - #define AT_HWCAP2 0 diff --git a/package/libnss/0003-Bug-1602288-Fix-build-failure-due-to-missing-posix-s.patch b/package/libnss/0002-Bug-1602288-Fix-build-failure-due-to-missing-posix-s.patch similarity index 100% rename from package/libnss/0003-Bug-1602288-Fix-build-failure-due-to-missing-posix-s.patch rename to package/libnss/0002-Bug-1602288-Fix-build-failure-due-to-missing-posix-s.patch diff --git a/package/libnss/0004-Bug-1602743-Fix-PowerPc-build-sys-auxv.h-failure.patch b/package/libnss/0003-Bug-1602743-Fix-PowerPc-build-sys-auxv.h-failure.patch similarity index 100% rename from package/libnss/0004-Bug-1602743-Fix-PowerPc-build-sys-auxv.h-failure.patch rename to package/libnss/0003-Bug-1602743-Fix-PowerPc-build-sys-auxv.h-failure.patch diff --git a/package/libnss/0005-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch b/package/libnss/0004-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch similarity index 100% rename from package/libnss/0005-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch rename to package/libnss/0004-Bug-1603398-Fix-nsinstall.c-build-failure-on-RHEL-7.patch