summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/rng-tools
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support/rng-tools')
-rw-r--r--meta/recipes-support/rng-tools/rng-tools/uclibc-libuargp-configure.patch63
-rw-r--r--meta/recipes-support/rng-tools/rng-tools_5.bb3
2 files changed, 0 insertions, 66 deletions
diff --git a/meta/recipes-support/rng-tools/rng-tools/uclibc-libuargp-configure.patch b/meta/recipes-support/rng-tools/rng-tools/uclibc-libuargp-configure.patch
deleted file mode 100644
index e691315d16..0000000000
--- a/meta/recipes-support/rng-tools/rng-tools/uclibc-libuargp-configure.patch
+++ /dev/null
@@ -1,63 +0,0 @@
1In case of uclibc, use libuargp
2
3If we use uclibc for system libraries, select libuargp
4
5Upstream-Status: Pending
6
7Signed-off-by: Maxin B. John <maxin.john@intel.com>
8---
9diff -Naur rng-tools-5-orig/configure.ac rng-tools-5/configure.ac
10--- rng-tools-5-orig/configure.ac 2016-02-24 18:11:24.023690235 +0200
11+++ rng-tools-5/configure.ac 2016-02-24 18:14:49.763118138 +0200
12@@ -39,6 +39,13 @@
13 [with_libargp=check]
14 )
15
16+AC_ARG_ENABLE([uclibc],
17+ AS_HELP_STRING([--enable-uclibc], [Use uclibc for system libraries]),
18+ use_uclibc=yes, use_uclibc=no)
19+AM_CONDITIONAL(USE_UCLIBC, test "x$use_uclibc" = "xyes")
20+AS_IF([test "x$use_uclibc" = "xyes"], [AC_DEFINE(USE_UCLIBC)])
21+AH_TEMPLATE([USE_UCLIBC], [Defined if uclibc libraries are used.])
22+
23 dnl Make sure anyone changing configure.ac/Makefile.am has a clue
24 AM_MAINTAINER_MODE
25
26@@ -101,7 +108,7 @@
27 [need_libargp=no],
28 [need_libargp=yes
29 if test "x$with_libargp" = "xno"; then
30- AC_MSG_FAILURE([libargp disabled and libc does not have argp])
31+ AC_MSG_WARN([libargp disabled and libc does not have argp])
32 fi]
33 )
34 ],
35@@ -110,7 +117,7 @@
36
37 dnl Check for libargp
38 AS_IF(
39- [test "x$need_libargp" = "xyes"],
40+ [test "x$need_libargp" = "xyes" -a "x$use_uclibc" = "xno"],
41 [
42 AC_CHECK_LIB(
43 [argp],
44@@ -120,6 +127,19 @@
45 )
46 ]
47 )
48+
49+dnl Check for libuargp
50+AS_IF(
51+ [test "x$use_uclibc" = "xyes"],
52+ [
53+ AC_CHECK_LIB(
54+ [uargp],
55+ [argp_parse],
56+ [LIBS="$LIBS -luargp"],
57+ [AC_MSG_FAILURE([libuargp not found])]
58+ )
59+ ]
60+)
61
62 dnl -----------------
63 dnl Configure options
diff --git a/meta/recipes-support/rng-tools/rng-tools_5.bb b/meta/recipes-support/rng-tools/rng-tools_5.bb
index e2acaba91a..de6e5f9a76 100644
--- a/meta/recipes-support/rng-tools/rng-tools_5.bb
+++ b/meta/recipes-support/rng-tools/rng-tools_5.bb
@@ -6,7 +6,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/gkernel/${BP}.tar.gz \
6 file://0001-If-the-libc-is-lacking-argp-use-libargp.patch \ 6 file://0001-If-the-libc-is-lacking-argp-use-libargp.patch \
7 file://0002-Add-argument-to-control-the-libargp-dependency.patch \ 7 file://0002-Add-argument-to-control-the-libargp-dependency.patch \
8 file://underquote.patch \ 8 file://underquote.patch \
9 file://uclibc-libuargp-configure.patch \
10 file://rng-tools-5-fix-textrels-on-PIC-x86.patch \ 9 file://rng-tools-5-fix-textrels-on-PIC-x86.patch \
11 file://init \ 10 file://init \
12 file://default" 11 file://default"
@@ -25,9 +24,7 @@ inherit autotools update-rc.d
25 24
26PACKAGECONFIG = "libgcrypt" 25PACKAGECONFIG = "libgcrypt"
27PACKAGECONFIG_libc-musl = "libargp" 26PACKAGECONFIG_libc-musl = "libargp"
28PACKAGECONFIG_libc-uclibc = "libuargp"
29PACKAGECONFIG[libargp] = "--with-libargp,--without-libargp,argp-standalone," 27PACKAGECONFIG[libargp] = "--with-libargp,--without-libargp,argp-standalone,"
30PACKAGECONFIG[libuargp] = "--enable-uclibc,,,"
31PACKAGECONFIG[libgcrypt] = "--with-libgcrypt,--without-libgcrypt,libgcrypt," 28PACKAGECONFIG[libgcrypt] = "--with-libgcrypt,--without-libgcrypt,libgcrypt,"
32 29
33do_install_append() { 30do_install_append() {