technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Configure: using comma instead of space for passing -rpath value.

Browse Source 
This variant will be more interoperable across various systems
and it's already used in Ruby module.

Otherwise, configure tests fail on NetBSD with:

  gcc: Missing argument for -Wl,-rpath
This commit is contained in:
Valentin Bartenev
2020-10-26 22:24:32 +03:00
parent 54837759f3
commit 84136eb49d
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
auto/modules/java
View File

@@ -178,7 +178,7 @@ fi
NXT_JAVA_LIB_SERVER_PATH="${NXT_JAVA_LIB_PATH}/server" NXT_JAVA_LIB_SERVER_PATH="${NXT_JAVA_LIB_PATH}/server"
NXT_JAVA_LDFLAGS="-L${NXT_JAVA_LIB_SERVER_PATH} -Wl,-rpath ${NXT_JAVA_LIB_SERVER_PATH} -ljvm" NXT_JAVA_LDFLAGS="-L${NXT_JAVA_LIB_SERVER_PATH} -Wl,-rpath,${NXT_JAVA_LIB_SERVER_PATH} -ljvm"
nxt_found=no nxt_found=no

3
auto/modules/php
View File

@@ -111,8 +111,7 @@ if /bin/sh -c "${NXT_PHP_CONFIG} --version" >> $NXT_AUTOCONF_ERR 2>&1; then
if [ "$NXT_PHP_LIB_PATH" != "" ]; then if [ "$NXT_PHP_LIB_PATH" != "" ]; then
# "php-config --ldflags" does not contain path to libphp, but # "php-config --ldflags" does not contain path to libphp, but
# contains usually path to libraries required by extensions. # contains usually path to libraries required by extensions.
NXT_PHP_LDFLAGS="-L${NXT_PHP_LIB_PATH} \ NXT_PHP_LDFLAGS="-L${NXT_PHP_LIB_PATH} -Wl,-rpath,${NXT_PHP_LIB_PATH}"
-Wl,-rpath ${NXT_PHP_LIB_PATH}"
fi fi
fi fi

2
auto/modules/python
View File

@@ -73,7 +73,7 @@ if /bin/sh -c "$NXT_PYTHON_CONFIG --prefix" >> $NXT_AUTOCONF_ERR 2>&1; then
if [ "$NXT_PYTHON_LIB_PATH" != "" ]; then if [ "$NXT_PYTHON_LIB_PATH" != "" ]; then
# "python-config --ldflags" may not contain path to libpython. # "python-config --ldflags" may not contain path to libpython.
NXT_PYTHON_LDFLAGS="-L$NXT_PYTHON_LIB_PATH -Wl,-rpath $NXT_PYTHON_LIB_PATH" NXT_PYTHON_LDFLAGS="-L$NXT_PYTHON_LIB_PATH -Wl,-rpath,$NXT_PYTHON_LIB_PATH"
else else
NXT_PYTHON_LDFLAGS="" NXT_PYTHON_LDFLAGS=""
fi fi