jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-28 02:32:47 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

tools/build: Support building with glibc 2.38

Browse Source 
Ubuntu 23.10 uses glibc 2.38. This adds strlcpy and strlcmp so we need
to remove them from the cross build environment.

Reviewed by:	jrtc27 (earlier version), arichardson
Sponsored by:	Arm Ltd
Differential Revision:	https://reviews.freebsd.org/D42303
This commit is contained in:
Andrew Turner 2023-10-20 16:45:06 +01:00
parent f39010b139
commit ceefd491c7
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/build/Makefile
View File

@ -196,9 +196,15 @@ SRCS+= strtonum.c merge.c heapsort.c reallocf.c
SRCS+= rpmatch.c SRCS+= rpmatch.c
.if ${.MAKE.OS} == "Linux" .if ${.MAKE.OS} == "Linux"
# On Linux, glibc does not provide strlcpy,strlcat or strmode. # On Linux, glibc does not provide strmode. It only provides strlcpy
# and strlcat from glibc 2.38.
.PATH: ${LIBC_SRCTOP}/string .PATH: ${LIBC_SRCTOP}/string
SRCS+= strlcpy.c strlcat.c strmode.c SRCS+= strmode.c
# Assume if strlcpy exists so does strlcat
_WITH_EXPLICIT_STRLCPY!= cat ${HOST_INCLUDE_ROOT}/strings.h ${HOST_INCLUDE_ROOT}/string.h | grep -c strlcpy || true
.if ${_WITH_EXPLICIT_STRLCPY} == 0
SRCS+= strlcpy.c strlcat.c
.endif
# On Linux, glibc provides ffs* but not fls* # On Linux, glibc provides ffs* but not fls*
SRCS+= fls.c flsl.c flsll.c SRCS+= fls.c flsl.c flsll.c
# Compile the fgetln/fgetwln/closefrom fallback code from libbsd: # Compile the fgetln/fgetwln/closefrom fallback code from libbsd:

3
tools/build/cross-build/include/linux/string.h
View File

@ -47,8 +47,11 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
__BEGIN_DECLS __BEGIN_DECLS
#if !defined(__GLIBC__) || \
(defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 38) || !defined(_GNU_SOURCE)))
size_t strlcpy(char *dst, const char *src, size_t siz); size_t strlcpy(char *dst, const char *src, size_t siz);
size_t strlcat(char *dst, const char *src, size_t siz); size_t strlcat(char *dst, const char *src, size_t siz);
#endif
char *strnstr(const char *str, const char *find, size_t str_len); char *strnstr(const char *str, const char *find, size_t str_len);
void strmode(mode_t mode, char *str); void strmode(mode_t mode, char *str);