diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-19 16:34:41 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-23 13:00:50 +0100 |
commit | 632561df6a566e38f12096a81d8ffb7e70f618d7 (patch) | |
tree | 8dc144bcd9d70ec34783140c711d2ac41053d304 | |
parent | 9ab6962972973c9a6704a5ba1d08e2cbad505668 (diff) | |
download | poky-632561df6a566e38f12096a81d8ffb7e70f618d7.tar.gz |
console-tools: Fix build issues with make 3.82
The intl directory is part of older gettext and has macros which no
longer get expanded with recent gettext versions. This simply removes
the intl directory from the equation since we'd never need it.
(From OE-Core rev: 0f614f4c42fdf12124ac2e01334414f9219686c0)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/console-tools/console-tools-0.3.2/nodocs.patch | 5 | ||||
-rw-r--r-- | meta/recipes-core/console-tools/console-tools_0.3.2.bb | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/nodocs.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/nodocs.patch index 60b5ffd300..2ed609219c 100644 --- a/meta/recipes-core/console-tools/console-tools-0.3.2/nodocs.patch +++ b/meta/recipes-core/console-tools/console-tools-0.3.2/nodocs.patch | |||
@@ -1,5 +1,8 @@ | |||
1 | The docs need tools we don't have to build so disable them. | 1 | The docs need tools we don't have to build so disable them. |
2 | 2 | ||
3 | Also remove intl since the Makefile doesn't work with 3.82 and we | ||
4 | don't want to build libintl anyway. | ||
5 | |||
3 | Upstream-Status: Inappropriate [configuration] | 6 | Upstream-Status: Inappropriate [configuration] |
4 | RP 2012/10/17 | 7 | RP 2012/10/17 |
5 | 8 | ||
@@ -14,6 +17,6 @@ Index: console-tools-0.3.2/Makefile.am | |||
14 | -SUBDIRS = lib fontfiletools vttools kbdtools screenfonttools contrib doc \ | 17 | -SUBDIRS = lib fontfiletools vttools kbdtools screenfonttools contrib doc \ |
15 | - compat include examples po intl | 18 | - compat include examples po intl |
16 | +SUBDIRS = lib fontfiletools vttools kbdtools screenfonttools contrib \ | 19 | +SUBDIRS = lib fontfiletools vttools kbdtools screenfonttools contrib \ |
17 | + compat include examples po intl | 20 | + compat include examples po |
18 | 21 | ||
19 | EXTRA_DIST = BUGS RELEASE CREDITS COPYING.kbd local-scripts/* debian/* *.lsm | 22 | EXTRA_DIST = BUGS RELEASE CREDITS COPYING.kbd local-scripts/* debian/* *.lsm |
diff --git a/meta/recipes-core/console-tools/console-tools_0.3.2.bb b/meta/recipes-core/console-tools/console-tools_0.3.2.bb index d62c0bd069..a46e44d503 100644 --- a/meta/recipes-core/console-tools/console-tools_0.3.2.bb +++ b/meta/recipes-core/console-tools/console-tools_0.3.2.bb | |||
@@ -3,7 +3,7 @@ LICENSE = "GPLv2" | |||
3 | LIC_FILES_CHKSUM = "file://COPYING.kbd;md5=9b2d91511d3d80d4d20ac6e6b0137fe9" | 3 | LIC_FILES_CHKSUM = "file://COPYING.kbd;md5=9b2d91511d3d80d4d20ac6e6b0137fe9" |
4 | SUMMARY = "Allows you to set-up and manipulate the Linux console." | 4 | SUMMARY = "Allows you to set-up and manipulate the Linux console." |
5 | DESCRIPTION = "Provides tools that enable the set-up and manipulation of the linux console and console-font files." | 5 | DESCRIPTION = "Provides tools that enable the set-up and manipulation of the linux console and console-font files." |
6 | PR = "r6" | 6 | PR = "r7" |
7 | 7 | ||
8 | SRC_URI = "${SOURCEFORGE_MIRROR}/lct/console-tools-${PV}.tar.gz \ | 8 | SRC_URI = "${SOURCEFORGE_MIRROR}/lct/console-tools-${PV}.tar.gz \ |
9 | file://codepage.patch \ | 9 | file://codepage.patch \ |