1*e760df85SPatrick WilliamsFrom ac72fffe639d564f59ec1e1eafde83980acef1b5 Mon Sep 17 00:00:00 2001
2*e760df85SPatrick WilliamsFrom: Khem Raj <raj.khem@gmail.com>
3*e760df85SPatrick WilliamsDate: Tue, 23 May 2023 14:40:31 -0700
4*e760df85SPatrick WilliamsSubject: [PATCH] makefiles: Append to CFLAGS instead of re-assign
5*e760df85SPatrick Williams
6*e760df85SPatrick WilliamsThis helps in inserting yocto provided CFLAGS from build environment
7*e760df85SPatrick Williams
8*e760df85SPatrick WilliamsUpstream-Status: Inappropriate [No upstream]
9*e760df85SPatrick WilliamsSigned-off-by: Khem Raj <raj.khem@gmail.com>
10*e760df85SPatrick Williams---
11*e760df85SPatrick Williams jailtest/Makefile    | 2 +-
12*e760df85SPatrick Williams mconsole/Makefile    | 2 +-
13*e760df85SPatrick Williams moo/Makefile         | 2 +-
14*e760df85SPatrick Williams port-helper/Makefile | 2 +-
15*e760df85SPatrick Williams tunctl/Makefile      | 2 +-
16*e760df85SPatrick Williams uml_net/Makefile     | 2 +-
17*e760df85SPatrick Williams uml_router/Makefile  | 2 +-
18*e760df85SPatrick Williams watchdog/Makefile    | 2 +-
19*e760df85SPatrick Williams 8 files changed, 8 insertions(+), 8 deletions(-)
20*e760df85SPatrick Williams
21*e760df85SPatrick Williamsdiff --git a/jailtest/Makefile b/jailtest/Makefile
22*e760df85SPatrick Williamsindex 610ca1a..025fca9 100644
23*e760df85SPatrick Williams--- a/jailtest/Makefile
24*e760df85SPatrick Williams+++ b/jailtest/Makefile
25*e760df85SPatrick Williams@@ -1,6 +1,6 @@
26*e760df85SPatrick Williams OBJS = jailtest.o
27*e760df85SPatrick Williams BIN = jailtest
28*e760df85SPatrick Williams-CFLAGS = -g -Wall
29*e760df85SPatrick Williams+CFLAGS += -g -Wall
30*e760df85SPatrick Williams
31*e760df85SPatrick Williams BIN_DIR ?= /usr/bin
32*e760df85SPatrick Williams
33*e760df85SPatrick Williamsdiff --git a/mconsole/Makefile b/mconsole/Makefile
34*e760df85SPatrick Williamsindex 9818d8a..74a2560 100644
35*e760df85SPatrick Williams--- a/mconsole/Makefile
36*e760df85SPatrick Williams+++ b/mconsole/Makefile
37*e760df85SPatrick Williams@@ -1,6 +1,6 @@
38*e760df85SPatrick Williams BIN = uml_mconsole
39*e760df85SPatrick Williams OBJS = $(BIN).o
40*e760df85SPatrick Williams-CFLAGS = -g -Wall
41*e760df85SPatrick Williams+CFLAGS += -g -Wall
42*e760df85SPatrick Williams
43*e760df85SPatrick Williams BIN_DIR ?= /usr/bin
44*e760df85SPatrick Williams
45*e760df85SPatrick Williamsdiff --git a/moo/Makefile b/moo/Makefile
46*e760df85SPatrick Williamsindex 6cdb591..60d300d 100644
47*e760df85SPatrick Williams--- a/moo/Makefile
48*e760df85SPatrick Williams+++ b/moo/Makefile
49*e760df85SPatrick Williams@@ -3,7 +3,7 @@ BIN = uml_moo uml_mkcow
50*e760df85SPatrick Williams uml_moo_OBJS = uml_moo.o cow.o
51*e760df85SPatrick Williams uml_mkcow_OBJS = uml_mkcow.o cow.o
52*e760df85SPatrick Williams
53*e760df85SPatrick Williams-CFLAGS = -g -Wall -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
54*e760df85SPatrick Williams+CFLAGS += -g -Wall -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
55*e760df85SPatrick Williams
56*e760df85SPatrick Williams BIN_DIR ?= /usr/bin
57*e760df85SPatrick Williams
58*e760df85SPatrick Williamsdiff --git a/port-helper/Makefile b/port-helper/Makefile
59*e760df85SPatrick Williamsindex 8e33bdf..8b695f3 100644
60*e760df85SPatrick Williams--- a/port-helper/Makefile
61*e760df85SPatrick Williams+++ b/port-helper/Makefile
62*e760df85SPatrick Williams@@ -1,6 +1,6 @@
63*e760df85SPatrick Williams OBJS = port-helper.o
64*e760df85SPatrick Williams BIN = port-helper
65*e760df85SPatrick Williams-CFLAGS = -g -Wall
66*e760df85SPatrick Williams+CFLAGS += -g -Wall
67*e760df85SPatrick Williams
68*e760df85SPatrick Williams LIB_DIR ?= /usr/lib/uml
69*e760df85SPatrick Williams
70*e760df85SPatrick Williamsdiff --git a/tunctl/Makefile b/tunctl/Makefile
71*e760df85SPatrick Williamsindex 743bfea..a39ad2b 100644
72*e760df85SPatrick Williams--- a/tunctl/Makefile
73*e760df85SPatrick Williams+++ b/tunctl/Makefile
74*e760df85SPatrick Williams@@ -1,6 +1,6 @@
75*e760df85SPatrick Williams OBJS = tunctl.o
76*e760df85SPatrick Williams BIN = tunctl
77*e760df85SPatrick Williams-CFLAGS = -g -Wall
78*e760df85SPatrick Williams+CFLAGS += -g -Wall
79*e760df85SPatrick Williams
80*e760df85SPatrick Williams BIN_DIR ?= /usr/bin
81*e760df85SPatrick Williams
82*e760df85SPatrick Williamsdiff --git a/uml_net/Makefile b/uml_net/Makefile
83*e760df85SPatrick Williamsindex 36efec6..2e1ad0e 100644
84*e760df85SPatrick Williams--- a/uml_net/Makefile
85*e760df85SPatrick Williams+++ b/uml_net/Makefile
86*e760df85SPatrick Williams@@ -1,7 +1,7 @@
87*e760df85SPatrick Williams TUNTAP = $(shell [ -e /usr/include/linux/if_tun.h ] && echo -DTUNTAP)
88*e760df85SPatrick Williams
89*e760df85SPatrick Williams BIN = uml_net
90*e760df85SPatrick Williams-CFLAGS = -g -Wall $(TUNTAP)
91*e760df85SPatrick Williams+CFLAGS += -g -Wall $(TUNTAP)
92*e760df85SPatrick Williams
93*e760df85SPatrick Williams BIN_DIR ?= /usr/bin
94*e760df85SPatrick Williams
95*e760df85SPatrick Williamsdiff --git a/uml_router/Makefile b/uml_router/Makefile
96*e760df85SPatrick Williamsindex b7b5401..e399ea5 100644
97*e760df85SPatrick Williams--- a/uml_router/Makefile
98*e760df85SPatrick Williams+++ b/uml_router/Makefile
99*e760df85SPatrick Williams@@ -2,7 +2,7 @@ TUNTAP = $(shell [ -e /usr/include/linux/if_tun.h ] && echo -DTUNTAP)
100*e760df85SPatrick Williams
101*e760df85SPatrick Williams OBJS = hash.o port.o uml_switch.o
102*e760df85SPatrick Williams BIN = uml_switch
103*e760df85SPatrick Williams-CFLAGS = -g -Wall $(TUNTAP)
104*e760df85SPatrick Williams+CFLAGS += -g -Wall $(TUNTAP)
105*e760df85SPatrick Williams
106*e760df85SPatrick Williams BIN_DIR ?= /usr/bin
107*e760df85SPatrick Williams
108*e760df85SPatrick Williamsdiff --git a/watchdog/Makefile b/watchdog/Makefile
109*e760df85SPatrick Williamsindex c26fd9f..5178cc6 100644
110*e760df85SPatrick Williams--- a/watchdog/Makefile
111*e760df85SPatrick Williams+++ b/watchdog/Makefile
112*e760df85SPatrick Williams@@ -1,6 +1,6 @@
113*e760df85SPatrick Williams BIN = uml_watchdog
114*e760df85SPatrick Williams OBJS = $(BIN).o
115*e760df85SPatrick Williams-CFLAGS = -g -Wall
116*e760df85SPatrick Williams+CFLAGS += -g -Wall
117*e760df85SPatrick Williams
118*e760df85SPatrick Williams BIN_DIR ?= /usr/bin
119*e760df85SPatrick Williams
120*e760df85SPatrick Williams--
121*e760df85SPatrick Williams2.40.1
122*e760df85SPatrick Williams
123