| Message ID | 20240722095445.60428-1-fontaine.fabrice@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] package/sconeserver: select libxcrypt if needed | expand |
On Mon, 22 Jul 2024 11:54:45 +0200 Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote: > Fix the following build failure raised since bump of glibc to version > 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97: > > In file included from /home/buildroot/instance-0/output-1/build/sconeserver-8d1935919a2013358993a8e9dfa992cbde56e503/sconex/ScriptBase.h:25, > from /home/buildroot/instance-0/output-1/build/sconeserver-8d1935919a2013358993a8e9dfa992cbde56e503/http/AuthRealm.h:26, > from /home/buildroot/instance-0/output-1/build/sconeserver-8d1935919a2013358993a8e9dfa992cbde56e503/http/AuthRealm.cpp:23: > /home/buildroot/instance-0/output-1/build/sconeserver-8d1935919a2013358993a8e9dfa992cbde56e503/sconex/sconex.h:124:12: fatal error: crypt.h: No such file or directory > 124 | # include <crypt.h> > | ^~~~~~~~~ > > Fixes: b5680f53d60acf8ff6010082f873438a39bd5d97 > - http://autobuild.buildroot.org/results/24461bdb0a5d9a062b682ae3aeefa73c0408040b > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > --- > package/sconeserver/Config.in | 1 + > package/sconeserver/sconeserver.mk | 1 + > 2 files changed, 2 insertions(+) Applied to master, thanks. Thomas
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes: > Fix the following build failure raised since bump of glibc to version > 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97: > In file included from /home/buildroot/instance-0/output-1/build/sconeserver-8d1935919a2013358993a8e9dfa992cbde56e503/sconex/ScriptBase.h:25, > from /home/buildroot/instance-0/output-1/build/sconeserver-8d1935919a2013358993a8e9dfa992cbde56e503/http/AuthRealm.h:26, > from /home/buildroot/instance-0/output-1/build/sconeserver-8d1935919a2013358993a8e9dfa992cbde56e503/http/AuthRealm.cpp:23: > /home/buildroot/instance-0/output-1/build/sconeserver-8d1935919a2013358993a8e9dfa992cbde56e503/sconex/sconex.h:124:12: fatal error: crypt.h: No such file or directory > 124 | # include <crypt.h> > | ^~~~~~~~~ > Fixes: b5680f53d60acf8ff6010082f873438a39bd5d97 > - http://autobuild.buildroot.org/results/24461bdb0a5d9a062b682ae3aeefa73c0408040b > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Committed to 2024.05.x, thanks.
diff --git a/package/sconeserver/Config.in b/package/sconeserver/Config.in index cce21fc860..d1a8a031be 100644 --- a/package/sconeserver/Config.in +++ b/package/sconeserver/Config.in @@ -3,6 +3,7 @@ menuconfig BR2_PACKAGE_SCONESERVER depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on !BR2_STATIC_LIBS # dlopen() + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_PCRE select BR2_PACKAGE_ZLIB help diff --git a/package/sconeserver/sconeserver.mk b/package/sconeserver/sconeserver.mk index 10a0a22597..bb0da12d4c 100644 --- a/package/sconeserver/sconeserver.mk +++ b/package/sconeserver/sconeserver.mk @@ -10,6 +10,7 @@ SCONESERVER_LICENSE = GPL-2.0+ SCONESERVER_LICENSE_FILES = COPYING SCONESERVER_DEPENDENCIES = \ host-pkgconf \ + $(if $(BR2_PACKAGE_LIBXCRYPT),libxcrypt) \ pcre \ zlib # disable image as it fails to build with ImageMagick
Fix the following build failure raised since bump of glibc to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97: In file included from /home/buildroot/instance-0/output-1/build/sconeserver-8d1935919a2013358993a8e9dfa992cbde56e503/sconex/ScriptBase.h:25, from /home/buildroot/instance-0/output-1/build/sconeserver-8d1935919a2013358993a8e9dfa992cbde56e503/http/AuthRealm.h:26, from /home/buildroot/instance-0/output-1/build/sconeserver-8d1935919a2013358993a8e9dfa992cbde56e503/http/AuthRealm.cpp:23: /home/buildroot/instance-0/output-1/build/sconeserver-8d1935919a2013358993a8e9dfa992cbde56e503/sconex/sconex.h:124:12: fatal error: crypt.h: No such file or directory 124 | # include <crypt.h> | ^~~~~~~~~ Fixes: b5680f53d60acf8ff6010082f873438a39bd5d97 - http://autobuild.buildroot.org/results/24461bdb0a5d9a062b682ae3aeefa73c0408040b Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- package/sconeserver/Config.in | 1 + package/sconeserver/sconeserver.mk | 1 + 2 files changed, 2 insertions(+)