NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
63935aef6f
kumquat-buildroot/package/x11r7/xlib_libXfont2/0001-configure-define-HAVE_LIBBSD-when-libbsd-was-found.patch

31 lines
890 B
Diff
Raw Normal View History

package/x11r7/xlib_libXfont2: fix libbsd detection Previous patch defined HAVE_LIBBSD even if strlcat function was present in libc leading to build errors due to inclusion of bsd/string.h: https://gitlab.freedesktop.org/xorg/lib/libxfont/blob/master/src/util/replace.h#L50 AC_SEARCH_LIBS is defined as "Search for a library defining function if it's not already available." https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/Libraries.html Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2019-10-19 09:48:26 +02:00
From 5fceeeb0d1cdccdb2870f65444f2965344f3b8b9 Mon Sep 17 00:00:00 2001
From: Bernd Kuhls <bernd.kuhls@t-online.de>
Date: Sat, 19 Oct 2019 09:32:41 +0200
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-13 21:54:43 +02:00
Subject: [PATCH] configure: define HAVE_LIBBSD when libbsd was found
Patch sent upstream:
https://gitlab.freedesktop.org/xorg/lib/libxfont/merge_requests/6
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/x11r7/xlib_libXfont2: fix libbsd detection Previous patch defined HAVE_LIBBSD even if strlcat function was present in libc leading to build errors due to inclusion of bsd/string.h: https://gitlab.freedesktop.org/xorg/lib/libxfont/blob/master/src/util/replace.h#L50 AC_SEARCH_LIBS is defined as "Search for a library defining function if it's not already available." https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/Libraries.html Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2019-10-19 09:48:26 +02:00
configure.ac | 3 +++
1 file changed, 3 insertions(+)
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-13 21:54:43 +02:00
diff --git a/configure.ac b/configure.ac
package/x11r7/xlib_libXfont2: fix libbsd detection Previous patch defined HAVE_LIBBSD even if strlcat function was present in libc leading to build errors due to inclusion of bsd/string.h: https://gitlab.freedesktop.org/xorg/lib/libxfont/blob/master/src/util/replace.h#L50 AC_SEARCH_LIBS is defined as "Search for a library defining function if it's not already available." https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/Libraries.html Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2019-10-19 09:48:26 +02:00
index f507c28..cc7ca91 100644
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-13 21:54:43 +02:00
--- a/configure.ac
+++ b/configure.ac
package/x11r7/xlib_libXfont2: fix libbsd detection Previous patch defined HAVE_LIBBSD even if strlcat function was present in libc leading to build errors due to inclusion of bsd/string.h: https://gitlab.freedesktop.org/xorg/lib/libxfont/blob/master/src/util/replace.h#L50 AC_SEARCH_LIBS is defined as "Search for a library defining function if it's not already available." https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/Libraries.html Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2019-10-19 09:48:26 +02:00
@@ -53,6 +53,9 @@ AC_CHECK_HEADERS([endian.h poll.h sys/poll.h])
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-13 21:54:43 +02:00
# Checks for library functions.
AC_CHECK_FUNCS([poll readlink])
package/x11r7/xlib_libXfont2: fix libbsd detection Previous patch defined HAVE_LIBBSD even if strlcat function was present in libc leading to build errors due to inclusion of bsd/string.h: https://gitlab.freedesktop.org/xorg/lib/libxfont/blob/master/src/util/replace.h#L50 AC_SEARCH_LIBS is defined as "Search for a library defining function if it's not already available." https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/Libraries.html Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2019-10-19 09:48:26 +02:00
AC_SEARCH_LIBS([strlcat], [bsd])
+if test "$ac_cv_search_strlcat" = "-lbsd"; then
+ AC_DEFINE(HAVE_LIBBSD,1,[Has libbsd])
+fi
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-13 21:54:43 +02:00
AC_CONFIG_LIBOBJ_DIR([src/util])
AC_REPLACE_FUNCS([reallocarray strlcat strlcpy])
--
2.20.1
Reference in New Issue Copy Permalink