From patchwork Sat Jan 10 08:10:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Suykov X-Patchwork-Id: 427329 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 278CE14016A for ; Sat, 10 Jan 2015 19:13:36 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4F95489F8E; Sat, 10 Jan 2015 08:13:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gkMwXWV3jbsI; Sat, 10 Jan 2015 08:13:32 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9B28089F92; Sat, 10 Jan 2015 08:13:32 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 3E9F71C2796 for ; Sat, 10 Jan 2015 08:13:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3969089F92 for ; Sat, 10 Jan 2015 08:13:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uC4wRbmSxSEH for ; Sat, 10 Jan 2015 08:13:30 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lb0-f177.google.com (mail-lb0-f177.google.com [209.85.217.177]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 0B24A89F8E for ; Sat, 10 Jan 2015 08:13:30 +0000 (UTC) Received: by mail-lb0-f177.google.com with SMTP id b6so11385802lbj.8 for ; Sat, 10 Jan 2015 00:13:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:subject:message-id:mime-version:content-type :content-disposition:user-agent; bh=Ri1yHLl0BfYMgz9tpHIIQaFRNYx8rhNRm/A5ezJcm7I=; b=jMyCWqXT/FPPzDOAluG82c6Su2ACZoLkXYujEv/AWnusmPzrhRDY1LNNOUfM9Kyo4g fIKIqmh4L/7TS4Y5iWJbiulgqQtXg5Z9usZn+w+7sTpOWg4iAdLUYzwICbEJ/1DkdJG4 c50YKhIca6DR3337uuC/0wDhTQ0gKrfiLYW+GPoyiQXD0xMvr/plYhor0hT3S6D2lQLj wjdxkWJwHluUzhAvzYvJaSm53K/0QxoFjyKPxB2cGcXi2MWruH1d5f9HmERM4FzPKjv5 ndLeNuZqqm2ewGMCkEUCf4289fWs/6imVLvzaGLr6MCZ8LHmp6pe91iSl669YUsCtM9d 7lBg== X-Received: by 10.112.130.34 with SMTP id ob2mr26069320lbb.78.1420877607650; Sat, 10 Jan 2015 00:13:27 -0800 (PST) Received: from localhost ([188.163.76.109]) by mx.google.com with ESMTPSA id zt4sm2255890lbb.3.2015.01.10.00.13.26 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 10 Jan 2015 00:13:27 -0800 (PST) Date: Sat, 10 Jan 2015 10:10:48 +0200 From: Alex Suykov To: buildroot@uclibc.org Message-ID: <20150110081048.GA18077@vostro> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) Subject: [Buildroot] [PATCH] newt: avoid poisoned paths 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" Fixes http://autobuild.buildroot.net/results/cb908f73b14e1510bea890167b3927afbf708d6f/ Signed-off-by: Alex Suykov --- newt-fix-makefile.patch renamed to 0001-newt-fix-makefile.patch package/newt/0001-newt-fix-makefile.patch | 35 +++++++++++++++++++++++++++++++ package/newt/0002-slang-include-dir.patch | 15 +++++++++++++ package/newt/newt-fix-makefile.patch | 35 ------------------------------- 3 files changed, 50 insertions(+), 35 deletions(-) create mode 100644 package/newt/0001-newt-fix-makefile.patch create mode 100644 package/newt/0002-slang-include-dir.patch delete mode 100644 package/newt/newt-fix-makefile.patch diff --git a/package/newt/0001-newt-fix-makefile.patch b/package/newt/0001-newt-fix-makefile.patch new file mode 100644 index 0000000..84152fb --- /dev/null +++ b/package/newt/0001-newt-fix-makefile.patch @@ -0,0 +1,35 @@ +Fix Makefile.in + +* Use $(CC) instead of $(CPP) to generate .depend file because + '$(CPP) -M' call does not support multiple input files. + This avoid the following error: + +make[1]: Entering directory `/opt/br/output/build/newt-0.51.0' +/opt/br/output/host/usr/bin/arm-none-linux-gnueabi-cpp -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -M newt.c button.c form.c checkbox.c entry.c label.c listbox.c scrollbar.c textbox.c scale.c grid.c windows.c buttonbar.c checkboxtree.c > .depend +arm-none-linux-gnueabi-cpp: too many input files +make[1]: *** [depend] Error 1 +make[1]: Leaving directory +`/opt/br/output/build/newt-0.51.0' +make: *** +[/opt/br/output/build/newt-0.51.0/.stamp_built] Error 2 + +Signed-off-by: Samuel Martin +Signed-off-by: Yegor Yefremov + +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: b/Makefile.in +=================================================================== +--- a/Makefile.in ++++ b/Makefile.in +@@ -121,7 +121,7 @@ + $(SHAREDDIR)/*.o *.$(SOEXT)* + + depend: +- $(CPP) $(CFLAGS) $(CPPFLAGS) -M $(SOURCES) > .depend ++ $(CC) $(CFLAGS) $(CPPFLAGS) -M $(SOURCES) > .depend + + $(SHAREDDIR): + mkdir -p $(SHAREDDIR) diff --git a/package/newt/0002-slang-include-dir.patch b/package/newt/0002-slang-include-dir.patch new file mode 100644 index 0000000..a88ee70 --- /dev/null +++ b/package/newt/0002-slang-include-dir.patch @@ -0,0 +1,15 @@ +slang.h is in sysroot/usr/include, no need to use -I + +Signed-off-by: Alex Suykov + +--- a/Makefile.in ++++ b/Makefile.in +@@ -5,7 +5,7 @@ + CPP = @CPP@ + CFLAGS = @CFLAGS@ + LDFLAGS = @LDFLAGS@ +-CPPFLAGS = -D_GNU_SOURCE -I/usr/include/slang @CPPFLAGS@ ++CPPFLAGS = -D_GNU_SOURCE @CPPFLAGS@ + GNU_LD = @GNU_LD@ + + VERSION = @VERSION@ diff --git a/package/newt/newt-fix-makefile.patch b/package/newt/newt-fix-makefile.patch deleted file mode 100644 index 84152fb..0000000 --- a/package/newt/newt-fix-makefile.patch +++ /dev/null @@ -1,35 +0,0 @@ -Fix Makefile.in - -* Use $(CC) instead of $(CPP) to generate .depend file because - '$(CPP) -M' call does not support multiple input files. - This avoid the following error: - -make[1]: Entering directory `/opt/br/output/build/newt-0.51.0' -/opt/br/output/host/usr/bin/arm-none-linux-gnueabi-cpp -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -M newt.c button.c form.c checkbox.c entry.c label.c listbox.c scrollbar.c textbox.c scale.c grid.c windows.c buttonbar.c checkboxtree.c > .depend -arm-none-linux-gnueabi-cpp: too many input files -make[1]: *** [depend] Error 1 -make[1]: Leaving directory -`/opt/br/output/build/newt-0.51.0' -make: *** -[/opt/br/output/build/newt-0.51.0/.stamp_built] Error 2 - -Signed-off-by: Samuel Martin -Signed-off-by: Yegor Yefremov - ---- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: b/Makefile.in -=================================================================== ---- a/Makefile.in -+++ b/Makefile.in -@@ -121,7 +121,7 @@ - $(SHAREDDIR)/*.o *.$(SOEXT)* - - depend: -- $(CPP) $(CFLAGS) $(CPPFLAGS) -M $(SOURCES) > .depend -+ $(CC) $(CFLAGS) $(CPPFLAGS) -M $(SOURCES) > .depend - - $(SHAREDDIR): - mkdir -p $(SHAREDDIR)