diff options
Diffstat (limited to 'meta-webserver/recipes-httpd/nostromo/files/0001-GNUmakefile-add-possibility-to-override-variables.patch')
-rw-r--r-- | meta-webserver/recipes-httpd/nostromo/files/0001-GNUmakefile-add-possibility-to-override-variables.patch | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/meta-webserver/recipes-httpd/nostromo/files/0001-GNUmakefile-add-possibility-to-override-variables.patch b/meta-webserver/recipes-httpd/nostromo/files/0001-GNUmakefile-add-possibility-to-override-variables.patch index 7cf011b1c8..8cd4682355 100644 --- a/meta-webserver/recipes-httpd/nostromo/files/0001-GNUmakefile-add-possibility-to-override-variables.patch +++ b/meta-webserver/recipes-httpd/nostromo/files/0001-GNUmakefile-add-possibility-to-override-variables.patch | |||
@@ -91,7 +91,9 @@ diff --git a/src/nhttpd/GNUmakefile b/src/nhttpd/GNUmakefile | |||
91 | index f6d12de..9524911 100644 | 91 | index f6d12de..9524911 100644 |
92 | --- a/src/nhttpd/GNUmakefile | 92 | --- a/src/nhttpd/GNUmakefile |
93 | +++ b/src/nhttpd/GNUmakefile | 93 | +++ b/src/nhttpd/GNUmakefile |
94 | @@ -1,18 +1,18 @@ | 94 | @@ -1,20 +1,20 @@ |
95 | # $nostromo: GNUmakefile,v 1.6 2016/04/12 19:02:06 hacki Exp $ | ||
96 | |||
95 | -CCFLAGS = -O2 -pipe -Wall -Wstrict-prototypes -c | 97 | -CCFLAGS = -O2 -pipe -Wall -Wstrict-prototypes -c |
96 | +CFLAGS := -O2 -pipe -Wall -Wstrict-prototypes -c | 98 | +CFLAGS := -O2 -pipe -Wall -Wstrict-prototypes -c |
97 | 99 | ||
@@ -120,14 +122,16 @@ diff --git a/src/tools/GNUmakefile b/src/tools/GNUmakefile | |||
120 | index 15bea61..663ddb5 100644 | 122 | index 15bea61..663ddb5 100644 |
121 | --- a/src/tools/GNUmakefile | 123 | --- a/src/tools/GNUmakefile |
122 | +++ b/src/tools/GNUmakefile | 124 | +++ b/src/tools/GNUmakefile |
123 | @@ -1,11 +1,11 @@ | 125 | @@ -1,13 +1,13 @@ |
126 | # $nostromo: GNUmakefile,v 1.3 2016/04/12 19:02:58 hacki Exp $ | ||
127 | |||
124 | -CCFLAGS = -O2 -pipe -Wall -Werror -Wstrict-prototypes -c | 128 | -CCFLAGS = -O2 -pipe -Wall -Werror -Wstrict-prototypes -c |
125 | +CCFLAGS := -O2 -pipe -Wall -Werror -Wstrict-prototypes | 129 | +CFLAGS = -O2 -pipe -Wall -Werror -Wstrict-prototypes |
126 | 130 | ||
127 | crypt: crypt.o | 131 | crypt: crypt.o |
128 | - cc -o crypt crypt.o -lcrypt | 132 | - cc -L../libbsd -o crypt crypt.o -lcrypt -lbsd |
129 | - strip crypt | 133 | - strip crypt |
130 | + $(CC) $(CFLAGS) -o crypt crypt.o -lcrypt | 134 | + $(CC) $(CFLAGS) -L../libbsd -o crypt crypt.o -lcrypt -lbsd |
131 | +# $(STRIP) crypt | 135 | +# $(STRIP) crypt |
132 | 136 | ||
133 | crypt.o: crypt.c | 137 | crypt.o: crypt.c |