diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-07-21 15:34:21 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-16 11:18:14 +0100 |
commit | 946e5f0bd17c02c4f19167800fc8841ed5bc1a08 (patch) | |
tree | 1129a1e8c4d72b2401ec38d0f4613352b6aa3584 /meta | |
parent | 4327c43470daa1d7ff913890c6c492e581e1f69c (diff) | |
download | poky-946e5f0bd17c02c4f19167800fc8841ed5bc1a08.tar.gz |
minicom: add configure option and PACKAGECONFIG for lockdev
* it's autodetected from sysroot
* add PACKAGECONFIG to make it deterministic
(From OE-Core master rev: a886f2f78c847df9d6fbbcbd3c4ad3581b928e2f)
(From OE-Core rev: 8eba15cb34c5ce9712968de04f849d5fa3e6a1db)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-extended/minicom/minicom-2.6.2/allow.to.disable.lockdev.patch | 21 | ||||
-rw-r--r-- | meta/recipes-extended/minicom/minicom_2.6.2.bb | 7 |
2 files changed, 27 insertions, 1 deletions
diff --git a/meta/recipes-extended/minicom/minicom-2.6.2/allow.to.disable.lockdev.patch b/meta/recipes-extended/minicom/minicom-2.6.2/allow.to.disable.lockdev.patch new file mode 100644 index 0000000000..f5c08896ff --- /dev/null +++ b/meta/recipes-extended/minicom/minicom-2.6.2/allow.to.disable.lockdev.patch | |||
@@ -0,0 +1,21 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
4 | |||
5 | --- a/configure.in 2013-02-06 18:18:13.000000000 +0100 | ||
6 | +++ b/configure.in 2013-07-21 15:31:27.614828894 +0200 | ||
7 | @@ -40,7 +40,13 @@ | ||
8 | fi | ||
9 | |||
10 | PKG_PROG_PKG_CONFIG | ||
11 | -if test -n "$PKG_CONFIG"; then | ||
12 | + | ||
13 | +AC_ARG_ENABLE([lockdev], | ||
14 | + AS_HELP_STRING([--enable-lockdev], | ||
15 | + [Enable lockdev support (def: enabled)]), | ||
16 | + [], [enable_lockdev="yes"]) | ||
17 | + | ||
18 | +if test -n "$PKG_CONFIG" && test "x$enable_lockdev" = xyes; then | ||
19 | PKG_CHECK_MODULES([LOCKDEV], [lockdev], AC_DEFINE([HAVE_LOCKDEV],[1],[Define if you have lockdev]),[:]) | ||
20 | fi | ||
21 | |||
diff --git a/meta/recipes-extended/minicom/minicom_2.6.2.bb b/meta/recipes-extended/minicom/minicom_2.6.2.bb index 0d65e80f51..558867d1d1 100644 --- a/meta/recipes-extended/minicom/minicom_2.6.2.bb +++ b/meta/recipes-extended/minicom/minicom_2.6.2.bb | |||
@@ -8,11 +8,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=420477abc567404debca0a2a1cb6b645 \ | |||
8 | 8 | ||
9 | PR = "r0" | 9 | PR = "r0" |
10 | 10 | ||
11 | SRC_URI = "http://alioth.debian.org/frs/download.php/3869/minicom-${PV}.tar.gz" | 11 | SRC_URI = "http://alioth.debian.org/frs/download.php/3869/minicom-${PV}.tar.gz \ |
12 | file://allow.to.disable.lockdev.patch \ | ||
13 | " | ||
12 | 14 | ||
13 | SRC_URI[md5sum] = "203c56c4b447f45e2301b0cc4e83da3c" | 15 | SRC_URI[md5sum] = "203c56c4b447f45e2301b0cc4e83da3c" |
14 | SRC_URI[sha256sum] = "f3cf215f7914ffa5528e398962176102ad74df27ba38958142f56aa6d15c9168" | 16 | SRC_URI[sha256sum] = "f3cf215f7914ffa5528e398962176102ad74df27ba38958142f56aa6d15c9168" |
15 | 17 | ||
18 | PACKAGECONFIG ??= "" | ||
19 | PACKAGECONFIG[lockdev] = "--enable-lockdev,--disable-lockdev,lockdev" | ||
20 | |||
16 | inherit autotools gettext | 21 | inherit autotools gettext |
17 | 22 | ||
18 | do_install() { | 23 | do_install() { |