summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/rng-tools/rng-tools/0001-If-the-libc-is-lacking-argp-use-libargp.patch
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2019-06-19 07:59:58 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-06-19 22:13:42 +0100
commitde7a2d26ec12facbef1d5a92922b4136ee803aaf (patch)
tree307f203e295decf89c4d6ec69f26e0fbee87c062 /meta/recipes-support/rng-tools/rng-tools/0001-If-the-libc-is-lacking-argp-use-libargp.patch
parent17e59cab322402bf2b3b7cdd4631d7a05036019c (diff)
downloadpoky-de7a2d26ec12facbef1d5a92922b4136ee803aaf.tar.gz
rng-tools: 6.6 -> 6.7
Upgrade rng-tools from 6.6 to latest commit 9fc873c which 26 commits beyond release 6.7: $ git describe 9fc873c5af0e39263 v6.7-26-g9fc873c Because it includes some critical fixes such as configure fails and 'Import yocto fixes for 6.6'. * remove local patches that all are merged by upstream * backport patch to fix rngd fails to stop issue * add PACKAGECONFIG libp11 (From OE-Core rev: 3e09c8b5b6517da97a9ec0ce5deb4ba1b066d19b) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/rng-tools/rng-tools/0001-If-the-libc-is-lacking-argp-use-libargp.patch')
-rw-r--r--meta/recipes-support/rng-tools/rng-tools/0001-If-the-libc-is-lacking-argp-use-libargp.patch60
1 files changed, 0 insertions, 60 deletions
diff --git a/meta/recipes-support/rng-tools/rng-tools/0001-If-the-libc-is-lacking-argp-use-libargp.patch b/meta/recipes-support/rng-tools/rng-tools/0001-If-the-libc-is-lacking-argp-use-libargp.patch
deleted file mode 100644
index 06d1d94369..0000000000
--- a/meta/recipes-support/rng-tools/rng-tools/0001-If-the-libc-is-lacking-argp-use-libargp.patch
+++ /dev/null
@@ -1,60 +0,0 @@
1From 06ba71887f667d45dd231a782a2751f36e8fe025 Mon Sep 17 00:00:00 2001
2From: Christopher Larson <chris_larson@mentor.com>
3Date: Mon, 15 Feb 2016 15:59:58 -0700
4Subject: [PATCH 1/4] If the libc is lacking argp, use libargp
5
6Patch pulled from Gentoo:
7
8 On glibc systems, argp is provided by libc. However, on
9 uclibc and other systems which lack argp in their C library,
10 argp might be provided by a stand alone library, libargp.
11 This patch adds tests to the build system to find who provides
12 argp.
13
14 X-Gentoo-Bug: 292191
15 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=292191
16 Reported-by: Ed Wildgoose <gentoo@wildgooses.com>
17 Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
18
19Upstream-Status: Pending
20Signed-off-by: Christopher Larson <chris_larson@mentor.com>
21---
22 configure.ac | 22 ++++++++++++++++++++++
23 1 file changed, 22 insertions(+)
24
25diff --git a/configure.ac b/configure.ac
26index 4e799dc..c4a5dd8 100644
27--- a/configure.ac
28+++ b/configure.ac
29@@ -135,6 +135,28 @@ AS_IF(
30 ]
31 )
32
33+dnl First check if we have argp available from libc
34+AC_LINK_IFELSE(
35+ [AC_LANG_PROGRAM(
36+ [#include <argp.h>],
37+ [int argc=1; char *argv[]={"test"}; argp_parse(0,argc,argv,0,0,0); return 0;]
38+ )],
39+ [libc_has_argp="true"],
40+ [libc_has_argp="false"]
41+)
42+
43+dnl If libc doesn't provide argp, then test for libargp
44+if test "$libc_has_argp" = "false" ; then
45+ AC_MSG_WARN("libc does not have argp")
46+ AC_CHECK_LIB([argp], [argp_parse], [have_argp="true"], [have_argp="false"])
47+
48+ if test "$have_argp" = "false"; then
49+ AC_MSG_ERROR("no libargp found")
50+ else
51+ LIBS+=" -largp"
52+ fi
53+fi
54+
55 dnl -----------------
56 dnl Configure options
57 dnl -----------------
58--
592.7.4
60