summaryrefslogtreecommitdiffstats
path: root/meta-webserver/recipes-httpd
diff options
context:
space:
mode:
authorDerek Straka <derek@asterius.io>2017-12-01 10:42:48 -0500
committerArmin Kuster <akuster808@gmail.com>2017-12-11 07:58:56 -0800
commitc0b74f42e00c84ba8419bc28de564cfa5c8d7987 (patch)
treee693e68643faa3e46cf966c8fcedcbf727883cf8 /meta-webserver/recipes-httpd
parent0af6439d1e37eb2131a972d6fe2d68ee79145d83 (diff)
downloadmeta-openembedded-c0b74f42e00c84ba8419bc28de564cfa5c8d7987.tar.gz
nginx: correctly set the endianness of the target
Add an inherit for siteinfo to get access to SITEINFO_ENDIANNESS Add a patch to have nginx actually use the user provided --with-endian Signed-off-by: Derek Straka <derek@asterius.io> Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-webserver/recipes-httpd')
-rw-r--r--meta-webserver/recipes-httpd/nginx/files/0001-Allow-the-overriding-of-the-endianness-via-the-confi.patch80
-rw-r--r--meta-webserver/recipes-httpd/nginx/nginx.inc3
2 files changed, 82 insertions, 1 deletions
diff --git a/meta-webserver/recipes-httpd/nginx/files/0001-Allow-the-overriding-of-the-endianness-via-the-confi.patch b/meta-webserver/recipes-httpd/nginx/files/0001-Allow-the-overriding-of-the-endianness-via-the-confi.patch
new file mode 100644
index 000000000..ffd5ee3e9
--- /dev/null
+++ b/meta-webserver/recipes-httpd/nginx/files/0001-Allow-the-overriding-of-the-endianness-via-the-confi.patch
@@ -0,0 +1,80 @@
1From be9970aa16c5142ef814531d74a07990a8e9eb14 Mon Sep 17 00:00:00 2001
2From: Derek Straka <derek@asterius.io>
3Date: Fri, 1 Dec 2017 10:32:29 -0500
4Subject: [PATCH] Allow the overriding of the endianness via the configure flag
5 --with-endian
6
7The existing configure options contain the --with-endian; however, the command
8line flag does not actually function. It does not set the endianness and it
9appears to do nothing.
10
11Upstream-Status: Pending
12
13Signed-off-by: Derek Straka <derek@asterius.io>
14
15diff --git a/auto/endianness b/auto/endianness
16index 1b552b6..be84487 100644
17--- a/auto/endianness
18+++ b/auto/endianness
19@@ -13,7 +13,13 @@ checking for system byte ordering
20 END
21
22
23-cat << END > $NGX_AUTOTEST.c
24+if [ ".$NGX_WITH_ENDIAN" = ".little" ]; then
25+ echo " little endian"
26+ have=NGX_HAVE_LITTLE_ENDIAN . auto/have
27+elif [ ".$NGX_WITH_ENDIAN" = ".big" ]; then
28+ echo " big endian"
29+else
30+ cat << END > $NGX_AUTOTEST.c
31
32 int main(void) {
33 int i = 0x11223344;
34@@ -26,25 +32,26 @@ int main(void) {
35
36 END
37
38-ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS \
39- -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs"
40+ ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS \
41+ -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs"
42
43-eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1"
44+ eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1"
45
46-if [ -x $NGX_AUTOTEST ]; then
47- if $NGX_AUTOTEST >/dev/null 2>&1; then
48- echo " little endian"
49- have=NGX_HAVE_LITTLE_ENDIAN . auto/have
50- else
51- echo " big endian"
52- fi
53+ if [ -x $NGX_AUTOTEST ]; then
54+ if $NGX_AUTOTEST >/dev/null 2>&1; then
55+ echo " little endian"
56+ have=NGX_HAVE_LITTLE_ENDIAN . auto/have
57+ else
58+ echo " big endian"
59+ fi
60
61- rm -rf $NGX_AUTOTEST*
62+ rm -rf $NGX_AUTOTEST*
63
64-else
65- rm -rf $NGX_AUTOTEST*
66+ else
67+ rm -rf $NGX_AUTOTEST*
68
69- echo
70- echo "$0: error: cannot detect system byte ordering"
71- exit 1
72+ echo
73+ echo "$0: error: cannot detect system byte ordering"
74+ exit 1
75+ fi
76 fi
77--
782.7.4
79
80
diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-webserver/recipes-httpd/nginx/nginx.inc
index 4a97e2670..51523b606 100644
--- a/meta-webserver/recipes-httpd/nginx/nginx.inc
+++ b/meta-webserver/recipes-httpd/nginx/nginx.inc
@@ -14,13 +14,14 @@ DEPENDS = "libpcre zlib openssl"
14SRC_URI = " \ 14SRC_URI = " \
15 http://nginx.org/download/nginx-${PV}.tar.gz \ 15 http://nginx.org/download/nginx-${PV}.tar.gz \
16 file://nginx-cross.patch \ 16 file://nginx-cross.patch \
17 file://0001-Allow-the-overriding-of-the-endianness-via-the-confi.patch \
17 file://nginx.conf \ 18 file://nginx.conf \
18 file://nginx.init \ 19 file://nginx.init \
19 file://nginx-volatile.conf \ 20 file://nginx-volatile.conf \
20 file://nginx.service \ 21 file://nginx.service \
21" 22"
22 23
23inherit update-rc.d useradd systemd 24inherit siteinfo update-rc.d useradd systemd
24 25
25SYSTEMD_SERVICE_${PN} = "nginx.service" 26SYSTEMD_SERVICE_${PN} = "nginx.service"
26 27