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>

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 (file)
--- 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 @@
 The docs need tools we don't have to build so disable them.
 
+Also remove intl since the Makefile doesn't work with 3.82 and we
+don't want to build libintl anyway.
+
 Upstream-Status: Inappropriate [configuration]
 RP 2012/10/17
 
@@ -14,6 +17,6 @@ Index: console-tools-0.3.2/Makefile.am
 -SUBDIRS = lib fontfiletools vttools kbdtools screenfonttools contrib doc \
 -      compat include examples po intl
 +SUBDIRS = lib fontfiletools vttools kbdtools screenfonttools contrib \
-+      compat include examples po intl
++      compat include examples po
  
  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 (file)
--- 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"
 LIC_FILES_CHKSUM = "file://COPYING.kbd;md5=9b2d91511d3d80d4d20ac6e6b0137fe9"
 SUMMARY = "Allows you to set-up and manipulate the Linux console."
 DESCRIPTION = "Provides tools that enable the set-up and manipulation of the linux console and console-font files."
-PR = "r6"
+PR = "r7"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/lct/console-tools-${PV}.tar.gz \
            file://codepage.patch \