summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/console-tools
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-19 16:34:41 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-19 16:38:01 (GMT)
commitf5ea427fa5e34993b385f56a3c57a7db94b6629d (patch)
treee3a1e45cef3a524469dd116ff0a38b43e310965e /meta/recipes-core/console-tools
parent4211de44e093f698604bbbb6c6ad70f63893cc14 (diff)
downloadpoky-f5ea427fa5e34993b385f56a3c57a7db94b6629d.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: 199298b6b114db09fd8ff100642ae101050a2e9a) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/console-tools')
-rw-r--r--meta/recipes-core/console-tools/console-tools-0.3.2/nodocs.patch5
-rw-r--r--meta/recipes-core/console-tools/console-tools_0.3.2.bb2
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 60b5ffd..2ed6092 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 @@
1The docs need tools we don't have to build so disable them. 1The docs need tools we don't have to build so disable them.
2 2
3Also remove intl since the Makefile doesn't work with 3.82 and we
4don't want to build libintl anyway.
5
3Upstream-Status: Inappropriate [configuration] 6Upstream-Status: Inappropriate [configuration]
4RP 2012/10/17 7RP 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 d62c0bd..a46e44d 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"
3LIC_FILES_CHKSUM = "file://COPYING.kbd;md5=9b2d91511d3d80d4d20ac6e6b0137fe9" 3LIC_FILES_CHKSUM = "file://COPYING.kbd;md5=9b2d91511d3d80d4d20ac6e6b0137fe9"
4SUMMARY = "Allows you to set-up and manipulate the Linux console." 4SUMMARY = "Allows you to set-up and manipulate the Linux console."
5DESCRIPTION = "Provides tools that enable the set-up and manipulation of the linux console and console-font files." 5DESCRIPTION = "Provides tools that enable the set-up and manipulation of the linux console and console-font files."
6PR = "r6" 6PR = "r7"
7 7
8SRC_URI = "${SOURCEFORGE_MIRROR}/lct/console-tools-${PV}.tar.gz \ 8SRC_URI = "${SOURCEFORGE_MIRROR}/lct/console-tools-${PV}.tar.gz \
9 file://codepage.patch \ 9 file://codepage.patch \