kumquat-buildroot/package/x11r7/xlib_libXfont2/0001-configure-define-HAVE_LIBBSD-when-libbsd-was-found.patch
Bernd Kuhls d32098fd08 package/x11r7/xlib_libXfont2: fix usage of libbsd
Upstream added optional support for libbsd:
"Add strlcat & strlcpy fallbacks if not provided by libc nor libbsd"
https://cgit.freedesktop.org/xorg/lib/libXfont/commit/?id=d4c941ea8b1dc07a14efce656bff58d31a14c985

and forgot to define HAVE_LIBBSD.

Also add libbsd as optional dependency because the build error occured
only when libbsd was built before building xlib_libXfont2.

Fixes:
http://autobuild.buildroot.net/results/165/165f9f948419fc69fbf6b9281d759b37bb7d40c6/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2019-10-16 23:23:06 +02:00

34 lines
993 B
Diff

From 10202b813f86e3f4d477fd82ee7fceac3bc2ebd0 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Date: Sun, 13 Oct 2019 21:21:28 +0200
Subject: [PATCH] configure: define HAVE_LIBBSD when libbsd was found
Source of the patch:
http://lists.busybox.net/pipermail/buildroot/2019-October/261510.html
Patch sent upstream:
https://gitlab.freedesktop.org/xorg/lib/libxfont/merge_requests/6
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
configure.ac | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index f507c28..131713d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,7 +52,8 @@ AC_CHECK_HEADERS([endian.h poll.h sys/poll.h])
# Checks for library functions.
AC_CHECK_FUNCS([poll readlink])
-AC_SEARCH_LIBS([strlcat], [bsd])
+AC_SEARCH_LIBS([strlcat], [bsd],
+ [AC_DEFINE(HAVE_LIBBSD,1,[Has libbsd])])
AC_CONFIG_LIBOBJ_DIR([src/util])
AC_REPLACE_FUNCS([reallocarray strlcat strlcpy])
--
2.20.1