diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-11-10 13:21:36 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-11-10 13:21:36 +0000 |
| commit | 77398e424e45d9e98c1cef3c43bdadb9d56e81ef (patch) | |
| tree | 5aeffd3fc7b92fc615bd2c222fa8831aeda1925b /www-servers/nginx-unit/files | |
| parent | bd4aeefe33e63f613512604e47bfca7b2187697d (diff) | |
gentoo resync : 10.11.2019
Diffstat (limited to 'www-servers/nginx-unit/files')
| -rw-r--r-- | www-servers/nginx-unit/files/auto-make.patch | 14 | ||||
| -rw-r--r-- | www-servers/nginx-unit/files/auto-os-conf.patch | 109 |
2 files changed, 123 insertions, 0 deletions
diff --git a/www-servers/nginx-unit/files/auto-make.patch b/www-servers/nginx-unit/files/auto-make.patch new file mode 100644 index 000000000000..9a157ed6a86d --- /dev/null +++ b/www-servers/nginx-unit/files/auto-make.patch @@ -0,0 +1,14 @@ +--- a/auto/make 2019-10-03 16:08:32.000000000 +0200 ++++ b/auto/make 2019-10-31 16:57:43.354566956 +0100 +@@ -13,10 +13,9 @@ + + cat << END > $NXT_MAKEFILE + ++AR = $AR + CC = $CC + +-CFLAGS = $NXT_CFLAGS $NXT_CC_OPT $CFLAGS +- + NXT_EXEC_LINK = $NXT_EXEC_LINK $NXT_LD_OPT + NXT_SHARED_LOCAL_LINK = $NXT_SHARED_LOCAL_LINK $NXT_LD_OPT + NXT_MODULE_LINK = $NXT_MODULE_LINK diff --git a/www-servers/nginx-unit/files/auto-os-conf.patch b/www-servers/nginx-unit/files/auto-os-conf.patch new file mode 100644 index 000000000000..e1d6775f9350 --- /dev/null +++ b/www-servers/nginx-unit/files/auto-os-conf.patch @@ -0,0 +1,109 @@ +--- a/auto/os/conf 2019-10-31 17:17:33.194445276 +0100 ++++ b/auto/os/conf 2019-10-31 17:19:51.780033224 +0100 +@@ -21,7 +21,7 @@ + Linux) + nxt_have=NXT_LINUX . auto/have + +- NXT_STATIC_LINK="ar -r -c" ++ NXT_STATIC_LINK="\$(AR) -r -c" + NXT_SHARED_LINK="\$(CC) -shared -Wl,-soname,libnxt.so" + NXT_SHARED_LOCAL_LINK="\$(CC) -shared \ + -Wl,-soname,\\\$\$ORIGIN/libnxt.so" +@@ -44,7 +44,7 @@ + FreeBSD) + nxt_have=NXT_FREEBSD . auto/have + +- NXT_STATIC_LINK="ar -r -c" ++ NXT_STATIC_LINK="\$(AR) -r -c" + NXT_SHARED_LINK="\$(CC) -shared -Wl,-soname,libnxt.so" + NXT_SHARED_LOCAL_LINK="\$(CC) -shared \ + -Wl,-soname,\\\$\$ORIGIN/libnxt.so" +@@ -71,14 +71,14 @@ + case "$NXT_CC_NAME" in + + SunC): +- NXT_STATIC_LINK="ar -r -c" ++ NXT_STATIC_LINK="\$(AR) -r -c" + NXT_SHARED_LINK="\$(CC) -G -h libnxt.so" + NXT_SHARED_LOCAL_LINK="\$(CC) -G -h \\\$\$ORIGIN/libnxt.so" + NXT_MODULE_LINK="\$(CC) -G" + ;; + + *) +- NXT_STATIC_LINK="ar -r -c" ++ NXT_STATIC_LINK="\$(AR) -r -c" + NXT_SHARED_LINK="\$(CC) -shared -Wl,-soname,libnxt.so" + NXT_SHARED_LOCAL_LINK="\$(CC) -shared \ + -Wl,-soname,\\\$\$ORIGIN/libnxt.so" +@@ -106,7 +106,7 @@ + # HFS+ volumes are caseless by default. + nxt_have=NXT_HAVE_CASELESS_FILESYSTEM . auto/have + +- NXT_STATIC_LINK="ar -r -c" ++ NXT_STATIC_LINK="\$(AR) -r -c" + NXT_SHARED_LINK="\$(CC) -dynamiclib" + NXT_SHARED_LOCAL_LINK="\$(CC) -dynamiclib \ + -install_name @executable_path/libnxt.dylib" +@@ -130,7 +130,7 @@ + NetBSD) + nxt_have=NXT_NETBSD . auto/have + +- NXT_STATIC_LINK="ar -r -c" ++ NXT_STATIC_LINK="\$(AR) -r -c" + NXT_SHARED_LINK="\$(CC) -shared" + NXT_SHARED_LOCAL_LINK="\$(CC) -shared" + NXT_MODULE_LINK="\$(CC) -shared" +@@ -152,7 +152,7 @@ + OpenBSD) + nxt_have=NXT_OPENBSD . auto/have + +- NXT_STATIC_LINK="ar -r -c" ++ NXT_STATIC_LINK="\$(AR) -r -c" + NXT_SHARED_LINK="\$(CC) -shared" + NXT_SHARED_LOCAL_LINK="\$(CC) -shared" + NXT_MODULE_LINK="\$(CC) -shared" +@@ -174,7 +174,7 @@ + DragonFly) + nxt_have=NXT_DRAGONFLY . auto/have + +- NXT_STATIC_LINK="ar -r -c" ++ NXT_STATIC_LINK="\$(AR) -r -c" + NXT_SHARED_LINK="\$(CC) -shared" + NXT_SHARED_LOCAL_LINK="\$(CC) -shared" + NXT_MODULE_LINK="\$(CC) -shared" +@@ -196,7 +196,7 @@ + AIX) + nxt_have=NXT_AIX . auto/have + +- NXT_STATIC_LINK="ar -r -c" ++ NXT_STATIC_LINK="\$(AR) -r -c" + NXT_SHARED_LINK="\$(CC) -G" + NXT_SHARED_LOCAL_LINK="\$(CC) -G" + NXT_MODULE_LINK="\$(CC) -G" +@@ -220,7 +220,7 @@ + NXT_EXEC_LINK="\$(CC)" + NXT_SHARED_LOCAL_EXEC_LINK= + +- NXT_STATIC_LINK="ar -r -c" ++ NXT_STATIC_LINK="\$(AR) -r -c" + NXT_SHARED_LINK="\$(CC) -shared" + NXT_SHARED_LOCAL_LINK="\$(CC) -shared" + NXT_MODULE_LINK="\$(CC) -shared" +@@ -238,7 +238,7 @@ + QNX) + nxt_have=NXT_QNX . auto/have + +- NXT_STATIC_LINK="ar -r -c" ++ NXT_STATIC_LINK="\$(AR) -r -c" + NXT_SHARED_LINK="\$(CC) -shared" + NXT_SHARED_LOCAL_LINK="\$(CC) -shared" + NXT_MODULE_LINK="\$(CC) -shared" +@@ -257,7 +257,7 @@ + ;; + + *) +- NXT_STATIC_LINK="ar -r -c" ++ NXT_STATIC_LINK="\$(AR) -r -c" + NXT_SHARED_LINK="\$(CC) -shared" + NXT_SHARED_LOCAL_LINK="\$(CC) -shared" + NXT_MODULE_LINK="\$(CC) -shared" |