| Message ID | 20240404205004.1797452-1-fontaine.fabrice@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] package/uhttpd: add libxcrypt optional dependency | expand |
Fabrice, All, On 2024-04-04 22:50 +0200, Fabrice Fontaine spake thusly: > Fix the following build failure raised since bump of glibc to version > 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97: > > /home/autobuild/autobuild/instance-4/output-1/host/lib/gcc/armeb-buildroot-linux-gnueabi/12.3.0/../../../../armeb-buildroot-linux-gnueabi/bin/ld: CMakeFiles/uhttpd.dir/main.c.o: in function `main': > /home/autobuild/autobuild/instance-4/output-1/build/uhttpd-15346de8d3ba422002496526ee24c62a3601ab8c/main.c:437:(.text.startup+0x628): undefined reference to `crypt' > > Fixes: b5680f53d60acf8ff6010082f873438a39bd5d97 > - http://autobuild.buildroot.org/results/ccd789b301b6ddcca1b29e26d5cc48d54427a001 > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/uhttpd/Config.in | 1 + > package/uhttpd/uhttpd.mk | 4 ++++ > 2 files changed, 5 insertions(+) > > diff --git a/package/uhttpd/Config.in b/package/uhttpd/Config.in > index 8d5d8bee13..eeb169a96d 100644 > --- a/package/uhttpd/Config.in > +++ b/package/uhttpd/Config.in > @@ -5,6 +5,7 @@ config BR2_PACKAGE_UHTTPD > depends on BR2_USE_MMU # fork() > select BR2_PACKAGE_LIBUBOX > select BR2_PACKAGE_JSON_C > + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC > help > uHTTPd is a tiny single threaded HTTP server with TLS, CGI > and Lua support. It is intended as a drop-in replacement for > diff --git a/package/uhttpd/uhttpd.mk b/package/uhttpd/uhttpd.mk > index ba8e13ccb8..f4fcccfa67 100644 > --- a/package/uhttpd/uhttpd.mk > +++ b/package/uhttpd/uhttpd.mk > @@ -11,6 +11,10 @@ UHTTPD_LICENSE = ISC > UHTTPD_LICENSE_FILES = uhttpd.h > UHTTPD_DEPENDENCIES = libubox json-c > > +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) > +UHTTPD_DEPENDENCIES += libxcrypt > +endif > + > ifeq ($(BR2_PACKAGE_LUA_5_1),y) > UHTTPD_DEPENDENCIES += lua > UHTTPD_CONF_OPTS += -DLUA_SUPPORT=ON > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot
diff --git a/package/uhttpd/Config.in b/package/uhttpd/Config.in index 8d5d8bee13..eeb169a96d 100644 --- a/package/uhttpd/Config.in +++ b/package/uhttpd/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_UHTTPD depends on BR2_USE_MMU # fork() select BR2_PACKAGE_LIBUBOX select BR2_PACKAGE_JSON_C + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC help uHTTPd is a tiny single threaded HTTP server with TLS, CGI and Lua support. It is intended as a drop-in replacement for diff --git a/package/uhttpd/uhttpd.mk b/package/uhttpd/uhttpd.mk index ba8e13ccb8..f4fcccfa67 100644 --- a/package/uhttpd/uhttpd.mk +++ b/package/uhttpd/uhttpd.mk @@ -11,6 +11,10 @@ UHTTPD_LICENSE = ISC UHTTPD_LICENSE_FILES = uhttpd.h UHTTPD_DEPENDENCIES = libubox json-c +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +UHTTPD_DEPENDENCIES += libxcrypt +endif + ifeq ($(BR2_PACKAGE_LUA_5_1),y) UHTTPD_DEPENDENCIES += lua UHTTPD_CONF_OPTS += -DLUA_SUPPORT=ON
Fix the following build failure raised since bump of glibc to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97: /home/autobuild/autobuild/instance-4/output-1/host/lib/gcc/armeb-buildroot-linux-gnueabi/12.3.0/../../../../armeb-buildroot-linux-gnueabi/bin/ld: CMakeFiles/uhttpd.dir/main.c.o: in function `main': /home/autobuild/autobuild/instance-4/output-1/build/uhttpd-15346de8d3ba422002496526ee24c62a3601ab8c/main.c:437:(.text.startup+0x628): undefined reference to `crypt' Fixes: b5680f53d60acf8ff6010082f873438a39bd5d97 - http://autobuild.buildroot.org/results/ccd789b301b6ddcca1b29e26d5cc48d54427a001 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- package/uhttpd/Config.in | 1 + package/uhttpd/uhttpd.mk | 4 ++++ 2 files changed, 5 insertions(+)