| Message ID | 20171030224555.3220-1-peter@korsgaard.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | openssh: fix getpagesize() related static linking issue | expand |
Hello, On Mon, 30 Oct 2017 23:45:55 +0100, Peter Korsgaard wrote: > 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> > --- > ...pat-bsd-getpagesize.c-include-includes.h-.patch | 35 ++++++++++++++++++++++ > 1 file changed, 35 insertions(+) > create mode 100644 package/openssh/0005-openbsd-compat-bsd-getpagesize.c-include-includes.h-.patch Applied to master, thanks. Thomas
>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes: > 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> Committed to 2017.02.x and 2017.08.x, thanks.
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 +
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> --- ...pat-bsd-getpagesize.c-include-includes.h-.patch | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/openssh/0005-openbsd-compat-bsd-getpagesize.c-include-includes.h-.patch