Gitiles
Code Review Sign In
gerrit.openbmc.org / mdmillerii / openbmc / da9b4349ae7caec03edc72a86511383bc9508f90 / . / meta-openembedded / meta-webserver / recipes-httpd / nostromo / files / 0001-GNUmakefile-add-possibility-to-override-variables.patch
blob: 8cd4682355ecddf66cb8cfe7efb8df57494c66e2 [file] [log] [blame]
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame]1From 7fa0d31ec5c0be9dca84a03851b2d44f61527ec8 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
3Date: Sun, 4 Dec 2011 16:01:04 +0100
4Subject: [PATCH] GNUmakefile: add possibility to override variables
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9this is useful for cross compilation
10
11Signed-off-by: Eric Bénard <eric@eukrea.com>
12---
13Upstream-Status: Inappropriate [embedded specific]
14 src/libbsd/GNUmakefile | 10 +++++-----
15 src/libmy/GNUmakefile | 26 +++++++++++++-------------
16 src/nhttpd/GNUmakefile | 12 ++++++------
17 src/tools/GNUmakefile | 8 ++++----
18 4 files changed, 28 insertions(+), 28 deletions(-)
19
20diff --git a/src/libbsd/GNUmakefile b/src/libbsd/GNUmakefile
21index e2d01a3..b034bc6 100644
22--- a/src/libbsd/GNUmakefile
23+++ b/src/libbsd/GNUmakefile
24@@ -1,12 +1,12 @@
25-CCFLAGS = -O2 -pipe -Wall -Werror -Wstrict-prototypes -c
26+CFLAGS := -O2 -pipe -Wall -Werror -Wstrict-prototypes -c
27
28 libbsd.a: strlcpy.o strlcat.o
29- ar -r libbsd.a strlcpy.o strlcat.o
30- ranlib libbsd.a
31+ $(AR) -r libbsd.a strlcpy.o strlcat.o
32+ $(RANLIB) libbsd.a
33
34 strlcpy.o: strlcpy.c
35- cc ${CCFLAGS} strlcpy.c
36+ $(CC) $(CFLAGS) strlcpy.c
37 strlcat.o: strlcat.c
38- cc ${CCFLAGS} strlcat.c
39+ $(CC) $(CFLAGS) strlcat.c
40 clean:
41 rm -f libbsd.a *.o
42diff --git a/src/libmy/GNUmakefile b/src/libmy/GNUmakefile
43index ce90dd9..891ffea 100644
44--- a/src/libmy/GNUmakefile
45+++ b/src/libmy/GNUmakefile
46@@ -1,30 +1,30 @@
47-CCFLAGS = -O2 -Wall -Werror -Wstrict-prototypes -c
48+CFLAGS := -O2 -Wall -Werror -Wstrict-prototypes -c
49
50 libmy.a: strcutl.o strcutw.o strcuts.o strcuti.o strcutf.o flog.o flogd.o fparse.o strlower.o strb64d.o
51- ar -r libmy.a strcutl.o strcutw.o strcuts.o strcuti.o strcutf.o flog.o flogd.o fparse.o strlower.o strb64d.o
52- ranlib libmy.a
53+ $(AR) -r libmy.a strcutl.o strcutw.o strcuts.o strcuti.o strcutf.o flog.o flogd.o fparse.o strlower.o strb64d.o
54+ $(RANLIB) libmy.a
55
56 strcutl.o: strcutl.c
57- cc ${CCFLAGS} strcutl.c
58+ $(CC) $(CFLAGS) strcutl.c
59 strcutw.o: strcutw.c
60- cc ${CCFLAGS} strcutw.c
61+ $(CC) $(CFLAGS) strcutw.c
62 strcuts.o: strcuts.c
63- cc ${CCFLAGS} strcuts.c
64+ $(CC) $(CFLAGS) strcuts.c
65 strcuti.o: strcuti.c
66- cc ${CCFLAGS} strcuti.c
67+ $(CC) $(CFLAGS) strcuti.c
68 strcutf.o: strcutf.c
69- cc ${CCFLAGS} strcutf.c
70+ $(CC) $(CFLAGS) strcutf.c
71 strlower.o: strlower.c
72- cc ${CCFLAGS} strlower.c
73+ $(CC) $(CFLAGS) strlower.c
74 strb64d.o: strb64d.c
75- cc ${CCFLAGS} strb64d.c
76+ $(CC) $(CFLAGS) strb64d.c
77
78 flog.o: flog.c
79- cc ${CCFLAGS} flog.c
80+ $(CC) $(CFLAGS) flog.c
81 flogd.o: flogd.c
82- cc ${CCFLAGS} flogd.c
83+ $(CC) $(CFLAGS) flogd.c
84 fparse.o: fparse.c
85- cc ${CCFLAGS} fparse.c
86+ $(CC) $(CFLAGS) fparse.c
87
88 clean:
89 rm -f libmy.a *.o
90diff --git a/src/nhttpd/GNUmakefile b/src/nhttpd/GNUmakefile
91index f6d12de..9524911 100644
92--- a/src/nhttpd/GNUmakefile
93+++ b/src/nhttpd/GNUmakefile
Patrick Williamsddad1a12017-02-23 20:36:32 -0600[diff] [blame]94@@ -1,20 +1,20 @@
95 # $nostromo: GNUmakefile,v 1.6 2016/04/12 19:02:06 hacki Exp $
96
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame]97-CCFLAGS = -O2 -pipe -Wall -Wstrict-prototypes -c
98+CFLAGS := -O2 -pipe -Wall -Wstrict-prototypes -c
99
100 nhttpd: main.o http.o sys.o
101- cc -L../libmy -L../libbsd -o nhttpd main.o http.o sys.o -lmy -lbsd -lssl -lcrypt
102- strip nhttpd
103+ $(CC) -L../libmy -L../libbsd -o nhttpd main.o http.o sys.o -lmy -lbsd -lssl -lcrypt
104+# $(STRIP) nhttpd
105 nroff -Tascii -c -mandoc nhttpd.8 > nhttpd.cat8
106
107 main.o: main.c
108- cc ${CCFLAGS} main.c
109+ $(CC) $(CFLAGS) main.c
110
111 http.o: http.c
112- cc ${CCFLAGS} http.c
113+ $(CC) $(CFLAGS) http.c
114
115 sys.o: sys.c
116- cc ${CCFLAGS} sys.c
117+ $(CC) $(CFLAGS) sys.c
118
119 clean:
120 rm -f nhttpd nhttpd.cat8 *.o
121diff --git a/src/tools/GNUmakefile b/src/tools/GNUmakefile
122index 15bea61..663ddb5 100644
123--- a/src/tools/GNUmakefile
124+++ b/src/tools/GNUmakefile
Patrick Williamsddad1a12017-02-23 20:36:32 -0600[diff] [blame]125@@ -1,13 +1,13 @@
126 # $nostromo: GNUmakefile,v 1.3 2016/04/12 19:02:58 hacki Exp $
127
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame]128-CCFLAGS = -O2 -pipe -Wall -Werror -Wstrict-prototypes -c
Patrick Williamsddad1a12017-02-23 20:36:32 -0600[diff] [blame]129+CFLAGS = -O2 -pipe -Wall -Werror -Wstrict-prototypes
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame]130
131 crypt: crypt.o
Patrick Williamsddad1a12017-02-23 20:36:32 -0600[diff] [blame]132- cc -L../libbsd -o crypt crypt.o -lcrypt -lbsd
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame]133- strip crypt
Patrick Williamsddad1a12017-02-23 20:36:32 -0600[diff] [blame]134+ $(CC) $(CFLAGS) -L../libbsd -o crypt crypt.o -lcrypt -lbsd
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame]135+# $(STRIP) crypt
136
137 crypt.o: crypt.c
138- cc ${CCFLAGS} crypt.c
139+ $(CC) $(CFLAGS) -c crypt.c
140
141 clean:
142 rm -f crypt *.o
143--
1441.7.6.4
145