aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Matt Weber <matthew.weber@rockwellcollins.com>2019-02-21 14:52:27 -0600
committerGravatar Peter Korsgaard <peter@korsgaard.com>2019-02-22 13:33:38 +0100
commita744c5c4dad325a8eb7c9c8dc7fc3852e82a7169 (patch)
tree206883c5c54e456f29fdad299769d4d3128f0aa9
parent7953a0d206a7f4cf71deb244177eac318f18b23b (diff)
downloadbuildroot-a744c5c4dad325a8eb7c9c8dc7fc3852e82a7169.tar.gz
buildroot-a744c5c4dad325a8eb7c9c8dc7fc3852e82a7169.tar.bz2
package/proftpd: prevent openssl pthread detection
The proftpd configure script doesn't use pkg-config to detect openssl libraries. Instead, it just adds -lcrypto. Since openssl may be linked with pthread, it tries to detect that by calling 'openssl version -f', which gives the arguments with which openssl was compiled. Since the openssl executable used is either host-openssl or the system installed openssl, the output of 'openssl version -f' is useless in Buildroot context. If the target toolchain doesn't have threads support, it will wrongly pick up -pthread from host-openssl. Fortunately there is a simple workaround: --without-openssl-cmdline says that there is no openssl executable and skips the test, so -pthread is not added. It turns out -pthread is never needed, even in static linking cases, because openssl/libressl puts the thread support in a separate object file that only gets linked in if the program actually uses threads (which proftpd doesn't). Fixes: http://autobuild.buildroot.net/results/9c25c3cb3cf93b76c0538c5376a803641bf6575b Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com> [Rewrite commit log, after additional analysis and testing] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> (cherry picked from commit 51bb23652fbb5597d10cf2dc49948f9405c5619b) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/proftpd/proftpd.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk
index 8f3ff5088e..1f1c742f66 100644
--- a/package/proftpd/proftpd.mk
+++ b/package/proftpd/proftpd.mk
@@ -21,7 +21,8 @@ PROFTPD_CONF_OPTS = \
--disable-facl \
--disable-dso \
--enable-shadow \
- --with-gnu-ld
+ --with-gnu-ld \
+ --without-openssl-cmdline
ifeq ($(BR2_PACKAGE_PROFTPD_MOD_REWRITE),y)
PROFTPD_MODULES += mod_rewrite