diff options
-rw-r--r-- | meta-webserver/recipes-httpd/nostromo/files/0001-GNUmakefile-add-possibility-to-override-variables.patch | 14 | ||||
-rw-r--r-- | meta-webserver/recipes-httpd/nostromo/nostromo_1.9.6.bb (renamed from meta-webserver/recipes-httpd/nostromo/nostromo_1.9.5.bb) | 6 |
2 files changed, 12 insertions, 8 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 |
diff --git a/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.5.bb b/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.6.bb index 562ecd0049..e06a6965fc 100644 --- a/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.5.bb +++ b/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.6.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | SUMMARY = "A simple, fast and secure HTTP server" | 1 | SUMMARY = "A simple, fast and secure HTTP server" |
2 | HOMEPAGE = "http://www.nazgul.ch/dev_nostromo.html" | 2 | HOMEPAGE = "http://www.nazgul.ch/dev_nostromo.html" |
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://src/nhttpd/main.c;beginline=2;endline=14;md5=e5ec3fa723b29b7d59d205afd8d36938" | 4 | LIC_FILES_CHKSUM = "file://src/nhttpd/main.c;beginline=2;endline=14;md5=0bb3711a867b9704d3bfabcf5529b64e" |
5 | 5 | ||
6 | SRC_URI = "http://www.nazgul.ch/dev/${BPN}-${PV}.tar.gz \ | 6 | SRC_URI = "http://www.nazgul.ch/dev/${BPN}-${PV}.tar.gz \ |
7 | file://0001-GNUmakefile-add-possibility-to-override-variables.patch \ | 7 | file://0001-GNUmakefile-add-possibility-to-override-variables.patch \ |
@@ -11,8 +11,8 @@ SRC_URI = "http://www.nazgul.ch/dev/${BPN}-${PV}.tar.gz \ | |||
11 | file://nostromo \ | 11 | file://nostromo \ |
12 | " | 12 | " |
13 | 13 | ||
14 | SRC_URI[md5sum] = "dc6cfd6b5aae04c370c7f818fa7bde55" | 14 | SRC_URI[md5sum] = "27aa241d78ff78920354c3e03a5026ea" |
15 | SRC_URI[sha256sum] = "5f62578285e02449406b46cf06a7888fe3dc4a90bedf58cc18523bad62f6b914" | 15 | SRC_URI[sha256sum] = "541494ecfeafec58c0876ccc90cc23b06e0144f6f42029af44c7cdb1f411e8eb" |
16 | 16 | ||
17 | TARGET_CC_ARCH += "${LDFLAGS}" | 17 | TARGET_CC_ARCH += "${LDFLAGS}" |
18 | 18 | ||