aboutsummaryrefslogtreecommitdiff
path: root/package/openssh
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2017-10-30 23:45:55 +0100
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-11-01 10:46:29 +0100
commitcc856401e8ac6a2c7a8767737b73dde933a5798a (patch)
treedc32c5335d0d87c044ff7e6e7d2ee73000f3258b /package/openssh
parent84ec4f15ebbc3fb0691c7775766864c5a5039ff5 (diff)
downloadbuildroot-cc856401e8ac6a2c7a8767737b73dde933a5798a.tar.gz
buildroot-cc856401e8ac6a2c7a8767737b73dde933a5798a.tar.bz2
openssh: fix getpagesize() related static linking issue
Fixes: http://autobuild.buildroot.net/results/8cc/8cc30818a400c7a392a3de787cabc9cd8425495f/ The configure script checks for getpagesize() and sets HAVE_GETPAGESIZE in config.h, but bsd-getpagesize.c forgot to include includes.h (which indirectly includes config.h) so the checks always fails, causing linker issues when linking statically on systems with getpagesize(). Fix it by including includes.h. Patch submitted upstream: https://lists.mindrot.org/pipermail/openssh-unix-dev/2017-October/036413.html Signed-off-by: Peter Korsgaard <peter@korsgaard.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/openssh')
-rw-r--r--package/openssh/0005-openbsd-compat-bsd-getpagesize.c-include-includes.h-.patch35
1 files changed, 35 insertions, 0 deletions
diff --git a/package/openssh/0005-openbsd-compat-bsd-getpagesize.c-include-includes.h-.patch b/package/openssh/0005-openbsd-compat-bsd-getpagesize.c-include-includes.h-.patch
new file mode 100644
index 0000000000..ce60072934
--- /dev/null
+++ b/package/openssh/0005-openbsd-compat-bsd-getpagesize.c-include-includes.h-.patch
@@ -0,0 +1,35 @@
+From 9a43657a3dcb868b4f36ade3aba5dcf0871fb412 Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <peter@korsgaard.com>
+Date: Mon, 30 Oct 2017 23:36:56 +0100
+Subject: [PATCH] openbsd-compat/bsd-getpagesize.c: include includes.h for
+ config.h defines
+
+The configure script checks for getpagesize() and sets HAVE_GETPAGESIZE in
+config.h, but bsd-getpagesize.c forgot to include includes.h (which
+indirectly includes config.h) so the checks always fails, causing linker
+issues when linking statically on systems with getpagesize():
+
+http://autobuild.buildroot.net/results/8cc/8cc30818a400c7a392a3de787cabc9cd8425495f/build-end.log
+
+Fix it by including includes.h
+
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+---
+ openbsd-compat/bsd-getpagesize.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/openbsd-compat/bsd-getpagesize.c b/openbsd-compat/bsd-getpagesize.c
+index 9daddfbd..416a8d4c 100644
+--- a/openbsd-compat/bsd-getpagesize.c
++++ b/openbsd-compat/bsd-getpagesize.c
+@@ -1,5 +1,7 @@
+ /* Placed in the public domain */
+
++#include "includes.h"
++
+ #ifndef HAVE_GETPAGESIZE
+
+ #include <unistd.h>
+--
+2.11.0
+