summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/rng-tools/rng-tools/underquote.patch31
-rw-r--r--meta/recipes-support/rng-tools/rng-tools_5.bb6
2 files changed, 34 insertions, 3 deletions
diff --git a/meta/recipes-support/rng-tools/rng-tools/underquote.patch b/meta/recipes-support/rng-tools/rng-tools/underquote.patch
new file mode 100644
index 0000000000..1422571818
--- /dev/null
+++ b/meta/recipes-support/rng-tools/rng-tools/underquote.patch
@@ -0,0 +1,31 @@
1Fix underquoted m4 entry. This causes a failure if gcrypt isn't present:
2
3| configure: libgcrypt support disabled
4| ../rng-tools-5/configure: line 4345: ac_fn_c_try_link: command not found
5| configure: error: in `/media/build1/poky/build/tmp/work/i586-poky-linux/rng-tools/5-r0/build':
6
7RP
82016/2/16
9
10Index: rng-tools-5/configure.ac
11===================================================================
12--- rng-tools-5.orig/configure.ac
13+++ rng-tools-5/configure.ac
14@@ -71,7 +71,7 @@ AS_IF(
15 [test "x$with_libgcrypt" != "xno"],
16 [
17 AC_CHECK_HEADER([gcrypt.h],
18- AC_CHECK_LIB(
19+ [AC_CHECK_LIB(
20 [gcrypt],
21 [gcry_check_version], ,
22 [
23@@ -80,7 +80,7 @@ AS_IF(
24 AC_MSG_NOTICE([libgcrypt support disabled])
25 fi
26 ]
27- ),
28+ )],
29 [if test "x$with_libgcrypt" != "xcheck"; then
30 AC_MSG_FAILURE([libgcrypt headers not found]); else
31 AC_MSG_NOTICE([libgcrypt support disabled])
diff --git a/meta/recipes-support/rng-tools/rng-tools_5.bb b/meta/recipes-support/rng-tools/rng-tools_5.bb
index 9a19d1cb42..bc679904eb 100644
--- a/meta/recipes-support/rng-tools/rng-tools_5.bb
+++ b/meta/recipes-support/rng-tools/rng-tools_5.bb
@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0b6f033afe6db235e559456585dc8cdc"
5SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/gkernel/${BP}.tar.gz \ 5SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/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://init \ 9 file://init \
9 file://default" 10 file://default"
10 11
@@ -20,12 +21,11 @@ python () {
20 21
21inherit autotools update-rc.d 22inherit autotools update-rc.d
22 23
23PACKAGECONFIG = "" 24PACKAGECONFIG = "libgcrypt"
24PACKAGECONFIG_libc-musl = "libargp" 25PACKAGECONFIG_libc-musl = "libargp"
25PACKAGECONFIG_libc-uclibc = "libargp" 26PACKAGECONFIG_libc-uclibc = "libargp"
26PACKAGECONFIG[libargp] = "--with-libargp,--without-libargp,argp-standalone," 27PACKAGECONFIG[libargp] = "--with-libargp,--without-libargp,argp-standalone,"
27 28PACKAGECONFIG[libgcrypt] = "--with-libgcrypt,--without-libgcrypt,libgcrypt,"
28RDEPENDS_${PN} = "libgcrypt"
29 29
30do_install_append() { 30do_install_append() {
31 # Only install the init script when 'sysvinit' is in DISTRO_FEATURES. 31 # Only install the init script when 'sysvinit' is in DISTRO_FEATURES.