Skip to contentSkip to conversation

nginx: add the LDFLAGS to the link arguments

PATCH New Derek Straka 1 participant 2 messages Aug 10, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 nginx: add the LDFLAGS to the link arguments

---
 meta-webserver/recipes-httpd/nginx/nginx.inc | 3 +++
 1 file changed, 3 insertions(+)
meta-webserver/recipes-httpd/nginx/nginx.inc +3 -0
index ebf926a..167dc5a 100644
@@ -41,6 +41,9 @@ do_configure () {
 	echo $CFLAGS
 	echo $LDFLAGS
 
+	# Add the LDFLAGS to the main nginx link to avoid issues with missing GNU_HASH
+	echo "MAIN_LINK=\"\${MAIN_LINK} ${LDFLAGS}\"" >> auto/cc/conf
+
 	./configure \
 	--crossbuild=Linux:${TUNE_ARCH} \
 	--with-endian=${@base_conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} \
Signature · 1 line
1.9.1
#1 lore raw

PATCH 2/2 nginx: update to version 1.11.3

---
 meta-webserver/recipes-httpd/nginx/nginx_1.11.2.bb | 10 ----------
 meta-webserver/recipes-httpd/nginx/nginx_1.11.3.bb | 10 ++++++++++
 2 files changed, 10 insertions(+), 10 deletions(-)
 delete mode 100644 meta-webserver/recipes-httpd/nginx/nginx_1.11.2.bb
 create mode 100644 meta-webserver/recipes-httpd/nginx/nginx_1.11.3.bb
meta-webserver/recipes-httpd/nginx/nginx_1.11.2.bb deleted +0 -10
deleted file mode 100644
index d8f78d0..0000000
@@ -1,10 +0,0 @@
-require nginx.inc
-
-# 1.10.x branch is the current stable branch, the recommended default
-# 1.9.x is the current mainline branches containing all new features
-DEFAULT_PREFERENCE = "-1"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=0bb58ed0dfd4f5dbece3b52aba79f023"
-
-SRC_URI[md5sum] = "9db11337a924a665ff68c1785bcf314e"
-SRC_URI[sha256sum] = "a0327be3e647bdc4a1b3ef98946a8e8fbf258ce8da6bed9a94222b249ae2700a"
meta-webserver/recipes-httpd/nginx/nginx_1.11.3.bb new file +10 -0
new file mode 100644
index 0000000..4e17c8a
@@ -0,0 +1,10 @@
+require nginx.inc
+
+# 1.10.x branch is the current stable branch, the recommended default
+# 1.11.x is the current mainline branches containing all new features
+DEFAULT_PREFERENCE = "-1"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=0bb58ed0dfd4f5dbece3b52aba79f023"
+
+SRC_URI[md5sum] = "18275c1daa39c5fac12e56c34907d45b"
+SRC_URI[sha256sum] = "4a667f40f9f3917069db1dea1f2d5baa612f1fa19378aadf71502e846a424610"
Signature · 1 line
1.9.1