aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2018-07-01 13:56:53 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2018-07-01 14:14:18 +0200
commit48a3afc12c858de22818412c3fb05ee2ba163e5a (patch)
tree7185d0b662209da51d8a79b4d1657057def8815b
parent7684637bf6274fdfde514d3320b1fc686fea5773 (diff)
downloadbuildroot-48a3afc12c858de22818412c3fb05ee2ba163e5a.tar.gz
buildroot-48a3afc12c858de22818412c3fb05ee2ba163e5a.tar.bz2
systemd: drop patch 0003-fix-am-path-libgcrypt-no-found.patch
Since commit db860d7837ca8665524f4046030beaf3d7f5e932 ("systemd: bump to 236, convert to meson"), we're no longer using the autotools build system, and have switched to meson. Therefore, patching m4 files is no longer useful. Suggested-by: Romain Naour <romain.naour@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rw-r--r--package/systemd/0003-fix-am-path-libgcrypt-no-found.patch159
1 files changed, 0 insertions, 159 deletions
diff --git a/package/systemd/0003-fix-am-path-libgcrypt-no-found.patch b/package/systemd/0003-fix-am-path-libgcrypt-no-found.patch
deleted file mode 100644
index 9935c44292..0000000000
--- a/package/systemd/0003-fix-am-path-libgcrypt-no-found.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-From 621d9b32d0a5598ea7f258b96f7110de4d1c48b6 Mon Sep 17 00:00:00 2001
-From: Eric Le Bihan <eric.le.bihan.dev@free.fr>
-Date: Fri, 28 Jul 2017 07:13:51 -0400
-Subject: [PATCH] Fix AM_PATH_LIBGCRYPT not found
-
-This patch installs a copy of libgcrypt.m4 from the libgcrypt source tarball
-to systemd m4 directory.
-
-Libgcrypt uses a custom m4 macro and not pkg-config to check if the
-development files are available. Though libgcrypt support is optional in
-systemd, this macro should be available whenever autoreconf is used, otherwise
-the re-configuration will fail with:
-
- configure.ac:616: warning: macro 'AM_PATH_LIBGCRYPT' not found in library
-
-As asking the user to install the development package of libgcrypt on the host
-machine or adding libgcrypt as a build dependency to systemd is not
-acceptable, the required file is added to the m4 directory.
-
-Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
-[Adam: Refresh for 234]
-Signed-off-by: Adam Duskett <aduskett@gmail.com>
----
- m4/libgcrypt.m4 | 123 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 123 insertions(+)
- create mode 100644 m4/libgcrypt.m4
-
-diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4
-new file mode 100644
-index 000000000..831dc0c6f
---- /dev/null
-+++ b/m4/libgcrypt.m4
-@@ -0,0 +1,123 @@
-+dnl Autoconf macros for libgcrypt
-+dnl Copyright (C) 2002, 2004 Free Software Foundation, Inc.
-+dnl
-+dnl This file is free software; as a special exception the author gives
-+dnl unlimited permission to copy and/or distribute it, with or without
-+dnl modifications, as long as this notice is preserved.
-+dnl
-+dnl This file is distributed in the hope that it will be useful, but
-+dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-+dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-+
-+
-+dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION,
-+dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
-+dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS.
-+dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed
-+dnl with the API version to also check the API compatibility. Example:
-+dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed
-+dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1. Using
-+dnl this features allows to prevent build against newer versions of libgcrypt
-+dnl with a changed API.
-+dnl
-+AC_DEFUN([AM_PATH_LIBGCRYPT],
-+[ AC_ARG_WITH(libgcrypt-prefix,
-+ AC_HELP_STRING([--with-libgcrypt-prefix=PFX],
-+ [prefix where LIBGCRYPT is installed (optional)]),
-+ libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="")
-+ if test x$libgcrypt_config_prefix != x ; then
-+ if test x${LIBGCRYPT_CONFIG+set} != xset ; then
-+ LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config
-+ fi
-+ fi
-+
-+ AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no)
-+ tmp=ifelse([$1], ,1:1.2.0,$1)
-+ if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
-+ req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
-+ min_libgcrypt_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
-+ else
-+ req_libgcrypt_api=0
-+ min_libgcrypt_version="$tmp"
-+ fi
-+
-+ AC_MSG_CHECKING(for LIBGCRYPT - version >= $min_libgcrypt_version)
-+ ok=no
-+ if test "$LIBGCRYPT_CONFIG" != "no" ; then
-+ req_major=`echo $min_libgcrypt_version | \
-+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
-+ req_minor=`echo $min_libgcrypt_version | \
-+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
-+ req_micro=`echo $min_libgcrypt_version | \
-+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
-+ libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version`
-+ major=`echo $libgcrypt_config_version | \
-+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
-+ minor=`echo $libgcrypt_config_version | \
-+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
-+ micro=`echo $libgcrypt_config_version | \
-+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
-+ if test "$major" -gt "$req_major"; then
-+ ok=yes
-+ else
-+ if test "$major" -eq "$req_major"; then
-+ if test "$minor" -gt "$req_minor"; then
-+ ok=yes
-+ else
-+ if test "$minor" -eq "$req_minor"; then
-+ if test "$micro" -ge "$req_micro"; then
-+ ok=yes
-+ fi
-+ fi
-+ fi
-+ fi
-+ fi
-+ fi
-+ if test $ok = yes; then
-+ AC_MSG_RESULT([yes ($libgcrypt_config_version)])
-+ else
-+ AC_MSG_RESULT(no)
-+ fi
-+ if test $ok = yes; then
-+ # If we have a recent libgcrypt, we should also check that the
-+ # API is compatible
-+ if test "$req_libgcrypt_api" -gt 0 ; then
-+ tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0`
-+ if test "$tmp" -gt 0 ; then
-+ AC_MSG_CHECKING([LIBGCRYPT API version])
-+ if test "$req_libgcrypt_api" -eq "$tmp" ; then
-+ AC_MSG_RESULT([okay])
-+ else
-+ ok=no
-+ AC_MSG_RESULT([does not match. want=$req_libgcrypt_api got=$tmp])
-+ fi
-+ fi
-+ fi
-+ fi
-+ if test $ok = yes; then
-+ LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
-+ LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
-+ ifelse([$2], , :, [$2])
-+ if test x"$host" != x ; then
-+ libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none`
-+ if test x"$libgcrypt_config_host" != xnone ; then
-+ if test x"$libgcrypt_config_host" != x"$host" ; then
-+ AC_MSG_WARN([[
-+***
-+*** The config script $LIBGCRYPT_CONFIG was
-+*** built for $libgcrypt_config_host and thus may not match the
-+*** used host $host.
-+*** You may want to use the configure option --with-libgcrypt-prefix
-+*** to specify a matching config script.
-+***]])
-+ fi
-+ fi
-+ fi
-+ else
-+ LIBGCRYPT_CFLAGS=""
-+ LIBGCRYPT_LIBS=""
-+ ifelse([$3], , :, [$3])
-+ fi
-+ AC_SUBST(LIBGCRYPT_CFLAGS)
-+ AC_SUBST(LIBGCRYPT_LIBS)
-+])
---
-2.14.4
-