diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-18 08:09:24 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-07-22 00:01:53 +0200 |
commit | 09d61e679acb184665fb781720c7404a99249a3c (patch) | |
tree | 4c80c3bb0c3ec96815ec320da2ecff9db83bc65b | |
parent | 097b1218743eedfe3e27b99fd51260774e476297 (diff) | |
download | meta-openembedded-09d61e679acb184665fb781720c7404a99249a3c.tar.gz |
hplip: Use "foreign" automake strictness and autotools-brokensep
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta-oe/recipes-extended/hplip/hplip-3.12.6/configure.patch | 14 | ||||
-rw-r--r-- | meta-oe/recipes-extended/hplip/hplip_3.12.6.bb | 3 |
2 files changed, 16 insertions, 1 deletions
diff --git a/meta-oe/recipes-extended/hplip/hplip-3.12.6/configure.patch b/meta-oe/recipes-extended/hplip/hplip-3.12.6/configure.patch new file mode 100644 index 000000000..31c005c60 --- /dev/null +++ b/meta-oe/recipes-extended/hplip/hplip-3.12.6/configure.patch | |||
@@ -0,0 +1,14 @@ | |||
1 | Index: hplip-3.12.6/configure.in | ||
2 | =================================================================== | ||
3 | --- hplip-3.12.6.orig/configure.in 2014-07-16 20:03:51.310044196 +0000 | ||
4 | +++ hplip-3.12.6/configure.in 2014-07-18 07:53:31.589559192 +0000 | ||
5 | @@ -27,8 +27,7 @@ | ||
6 | |||
7 | #AC_PREREQ(2.59) | ||
8 | AC_INIT([HP Linux Imaging and Printing], [3.12.6], [3.12.6], [hplip]) | ||
9 | -#AM_INIT_AUTOMAKE([1.9 foreign]) | ||
10 | -AM_INIT_AUTOMAKE | ||
11 | +AM_INIT_AUTOMAKE([1.9 foreign]) | ||
12 | AC_DISABLE_STATIC | ||
13 | |||
14 | # Checks for programs. | ||
diff --git a/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb b/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb index 95b6cabdc..fc5ef18a0 100644 --- a/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb +++ b/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb | |||
@@ -8,11 +8,12 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \ | |||
8 | file://setup-add-sleep-after-cups-reset.patch \ | 8 | file://setup-add-sleep-after-cups-reset.patch \ |
9 | file://fix-libusb-paths.patch \ | 9 | file://fix-libusb-paths.patch \ |
10 | file://cups-1.6.patch \ | 10 | file://cups-1.6.patch \ |
11 | file://configure.patch \ | ||
11 | " | 12 | " |
12 | 13 | ||
13 | DEPENDS += "cups python libusb" | 14 | DEPENDS += "cups python libusb" |
14 | 15 | ||
15 | inherit autotools python-dir pythonnative pkgconfig | 16 | inherit autotools-brokensep python-dir pythonnative pkgconfig |
16 | 17 | ||
17 | export BUILD_SYS | 18 | export BUILD_SYS |
18 | export HOST_SYS | 19 | export HOST_SYS |