mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-29 14:16:31 +00:00
httping: remove redundant 'override CFLAGS' patch
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) <arnout@mind.be> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
parent
847895d295
commit
4d93ca15bc
@ -1,53 +0,0 @@
|
|||||||
From 66f5811dd45fa27a7bfacf946dfefd16d765bb4d Mon Sep 17 00:00:00 2001
|
|
||||||
From: Gilles Talis <gilles.talis@gmail.com>
|
|
||||||
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 <gilles.talis@gmail.com>
|
|
||||||
---
|
|
||||||
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
|
|
||||||
|
|
@ -16,11 +16,11 @@ HTTPING_MAKE_OPT = $(TARGET_CONFIGURE_OPTS) \
|
|||||||
DEBUG=no
|
DEBUG=no
|
||||||
|
|
||||||
define HTTPING_BUILD_CMDS
|
define HTTPING_BUILD_CMDS
|
||||||
$(MAKE) $(HTTPING_MAKE_OPT) -C $(@D)
|
$(HTTPING_MAKE_OPT) $(MAKE) -C $(@D)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define HTTPING_INSTALL_TARGET_CMDS
|
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
|
endef
|
||||||
|
|
||||||
define HTTPING_CLEAN_CMDS
|
define HTTPING_CLEAN_CMDS
|
||||||
|
Loading…
x
Reference in New Issue
Block a user