From patchwork Sat Jan 19 13:52:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnout Vandecappelle X-Patchwork-Id: 213863 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 2482E2C007E for ; Sun, 20 Jan 2013 00:52:44 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id DF44B101827; Sat, 19 Jan 2013 13:52: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 q1p0PJOy2wuM; Sat, 19 Jan 2013 13:52:28 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id B714410185A; Sat, 19 Jan 2013 13:52:28 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 6BDD98F74B for ; Sat, 19 Jan 2013 13:52:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id BF9918CDF6 for ; Sat, 19 Jan 2013 13:52:38 +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 qSiDUmA2asg7 for ; Sat, 19 Jan 2013 13:52:38 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from viper.mind.be (132.79-246-81.adsl-static.isp.belgacom.be [81.246.79.132]) by whitealder.osuosl.org (Postfix) with ESMTPS id CA16D8C795 for ; Sat, 19 Jan 2013 13:52:37 +0000 (UTC) Received: from [172.16.2.6] (helo=vandecaa-laptop) by viper.mind.be with esmtp (Exim 4.69) (envelope-from ) id 1TwYqb-00015v-7A; Sat, 19 Jan 2013 14:52:37 +0100 Received: from arnout by vandecaa-laptop with local (Exim 4.80) (envelope-from ) id 1TwYqY-0001nM-2O; Sat, 19 Jan 2013 14:52:34 +0100 From: "Arnout Vandecappelle (Essensium/Mind)" To: buildroot@busybox.net Date: Sat, 19 Jan 2013 14:52:33 +0100 Message-Id: <1358603554-6869-1-git-send-email-arnout@mind.be> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <87ehhnudd9.fsf@dell.be.48ers.dk> References: <87ehhnudd9.fsf@dell.be.48ers.dk> Subject: [Buildroot] [PATCH] httping: remove redundant 'override CFLAGS' patch X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net From: "Arnout Vandecappelle (Essensium/Mind)" It is not necessary to override CFLAGS when CFLAGS is passed through the environment rather than as an argument to make. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/httping/httping-override-cflags.patch | 53 ------------------------- package/httping/httping.mk | 4 +- 2 files changed, 2 insertions(+), 55 deletions(-) delete mode 100644 package/httping/httping-override-cflags.patch diff --git a/package/httping/httping-override-cflags.patch b/package/httping/httping-override-cflags.patch deleted file mode 100644 index a3cf59d..0000000 --- a/package/httping/httping-override-cflags.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 66f5811dd45fa27a7bfacf946dfefd16d765bb4d Mon Sep 17 00:00:00 2001 -From: Gilles Talis -Date: Mon, 14 Jan 2013 11:48:00 -0800 -Subject: [PATCH] allow CFLAGS/LDFLAGS to be overriden from command line - -Ensure required CFLAGS/LDFLAGS are appended to those provided in command line - -Signed-off-by: Gilles Talis ---- - Makefile | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/Makefile b/Makefile -index 4c4f6a8..fdbb4cb 100644 ---- a/Makefile -+++ b/Makefile -@@ -19,7 +19,7 @@ TARGET=httping - DEBUG=yes - WFLAGS=-Wall -W - OFLAGS=-O3 --CFLAGS+=$(WFLAGS) $(OFLAGS) -DVERSION=\"$(VERSION)\" -+override CFLAGS+=$(WFLAGS) $(OFLAGS) -DVERSION=\"$(VERSION)\" - - PACKAGE=$(TARGET)-$(VERSION) - PREFIX=/usr -@@ -48,19 +48,19 @@ DOCS=license.txt license.OpenSSL readme.txt - # TFO=yes - - ifeq ($(SSL),no) --CFLAGS+=-DNO_SSL -+override CFLAGS+=-DNO_SSL - else - OBJS+=mssl.o --LDFLAGS+=-lssl -lcrypto -+override LDFLAGS+=-lssl -lcrypto - endif - - ifeq ($(TFO),yes) --CFLAGS+=-DTCP_TFO -+override CFLAGS+=-DTCP_TFO - endif - - ifeq ($(DEBUG),yes) --CFLAGS+=-D_DEBUG -ggdb --LDFLAGS+=-g -+override CFLAGS+=-D_DEBUG -ggdb -+override LDFLAGS+=-g - endif - - ifeq ($(ARM),yes) --- -1.7.4.1 - diff --git a/package/httping/httping.mk b/package/httping/httping.mk index 4c4d755..45478cf 100644 --- a/package/httping/httping.mk +++ b/package/httping/httping.mk @@ -16,11 +16,11 @@ HTTPING_MAKE_OPT = $(TARGET_CONFIGURE_OPTS) \ DEBUG=no define HTTPING_BUILD_CMDS - $(MAKE) $(HTTPING_MAKE_OPT) -C $(@D) + $(HTTPING_MAKE_OPT) $(MAKE) -C $(@D) endef define HTTPING_INSTALL_TARGET_CMDS - $(MAKE) $(HTTPING_MAKE_OPT) DESTDIR=$(TARGET_DIR) -C $(@D) install + $(HTTPING_MAKE_OPT) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install endef define HTTPING_CLEAN_CMDS