diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2015-09-17 00:46:27 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-01 07:43:34 +0100 |
commit | 38f0ffaf4349087ee34ff245f9d8e047bb4e9dea (patch) | |
tree | ba3d58af9339670a50c743ede24be57fc46f2fcd /meta/recipes-sato | |
parent | 56c0fdfd43c61d6568d180683b917223b5ab074f (diff) | |
download | poky-38f0ffaf4349087ee34ff245f9d8e047bb4e9dea.tar.gz |
meta: fix build with gettext 0.16.1
The gettext 0.16.1 doesn't install any m4 files to sysroot, please see
the following commit:
commit 9e10db5bdfe77c0ef2aff2f1cf89958b62c294a1
Author: Christopher Larson <kergoth@gmail.com>
Date: Mon Mar 17 18:10:54 2014 +0000
gettext-0.16.1: kill target m4 macros from sysroot
This is aim for using gettext-native's macros(gettext-native-0.19.4),
but when we set:
PREFERRED_VERSION_gettext = "0.16.1"
And build the recipes like pcmanfm, we would get errors when
do_configure:
configure:5164: error: possibly undefined macro: AM_NLS
This is because autotools_copy_aclocals doesn't copy the native macros
for target unless they're direct dependencies.
Add gettext-native to DEPENDS will fix the problem.
(From OE-Core rev: 48c168334bb60937653ab782026948d139603f8e)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato')
-rw-r--r-- | meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb | 2 | ||||
-rw-r--r-- | meta/recipes-sato/pcmanfm/pcmanfm_1.2.3.bb | 2 | ||||
-rw-r--r-- | meta/recipes-sato/puzzles/oh-puzzles_git.bb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb b/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb index f71514916b..093b89f779 100644 --- a/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb +++ b/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb | |||
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | |||
6 | file://src/leafpad.h;endline=20;md5=d3d6a89f5e61e8b13bdea537511ba1fa \ | 6 | file://src/leafpad.h;endline=20;md5=d3d6a89f5e61e8b13bdea537511ba1fa \ |
7 | file://src/utils.c;endline=20;md5=0d2cc6584ba3202448bb274f62739571" | 7 | file://src/utils.c;endline=20;md5=0d2cc6584ba3202448bb274f62739571" |
8 | 8 | ||
9 | DEPENDS = "gtk+ intltool-native libowl" | 9 | DEPENDS = "gtk+ intltool-native libowl gettext-native" |
10 | # The libowl requires x11 in DISTRO_FEATURES | 10 | # The libowl requires x11 in DISTRO_FEATURES |
11 | REQUIRED_DISTRO_FEATURES = "x11" | 11 | REQUIRED_DISTRO_FEATURES = "x11" |
12 | 12 | ||
diff --git a/meta/recipes-sato/pcmanfm/pcmanfm_1.2.3.bb b/meta/recipes-sato/pcmanfm/pcmanfm_1.2.3.bb index 4467303f6e..b63db875d2 100644 --- a/meta/recipes-sato/pcmanfm/pcmanfm_1.2.3.bb +++ b/meta/recipes-sato/pcmanfm/pcmanfm_1.2.3.bb | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ | |||
7 | file://src/gseal-gtk-compat.h;endline=21;md5=46922c8691f58d124f9420fe16149ce2" | 7 | file://src/gseal-gtk-compat.h;endline=21;md5=46922c8691f58d124f9420fe16149ce2" |
8 | 8 | ||
9 | SECTION = "x11" | 9 | SECTION = "x11" |
10 | DEPENDS = "gtk+ startup-notification libfm intltool-native" | 10 | DEPENDS = "gtk+ startup-notification libfm intltool-native gettext-native" |
11 | DEPENDS_append_poky = " libowl" | 11 | DEPENDS_append_poky = " libowl" |
12 | 12 | ||
13 | 13 | ||
diff --git a/meta/recipes-sato/puzzles/oh-puzzles_git.bb b/meta/recipes-sato/puzzles/oh-puzzles_git.bb index 36cd2cc7a2..9876fe0fd1 100644 --- a/meta/recipes-sato/puzzles/oh-puzzles_git.bb +++ b/meta/recipes-sato/puzzles/oh-puzzles_git.bb | |||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=f56ec6772dd1c7c367067bbea8ea1675 \ | |||
8 | file://src/tree234.c;endline=28;md5=b4feb1976feebf8f1379093ed52f2945" | 8 | file://src/tree234.c;endline=28;md5=b4feb1976feebf8f1379093ed52f2945" |
9 | 9 | ||
10 | SECTION = "x11" | 10 | SECTION = "x11" |
11 | DEPENDS = "gtk+ gconf intltool-native librsvg" | 11 | DEPENDS = "gtk+ gconf intltool-native librsvg gettext-native" |
12 | 12 | ||
13 | # libowl requires x11 in DISTRO_FEATURES | 13 | # libowl requires x11 in DISTRO_FEATURES |
14 | DEPENDS_append_poky = " ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libowl', '', d)}" | 14 | DEPENDS_append_poky = " ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libowl', '', d)}" |