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 | |
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')
-rw-r--r-- | meta/recipes-connectivity/connman/connman-gnome_0.7.bb | 2 | ||||
-rw-r--r-- | meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb | 2 | ||||
-rw-r--r-- | meta/recipes-gnome/libsecret/libsecret_0.18.2.bb | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-app/xwininfo_1.1.3.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/oprofile/oprofileui-server_git.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/oprofile/oprofileui_git.bb | 2 | ||||
-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 | ||||
-rw-r--r-- | meta/recipes-support/atk/at-spi2-core_2.16.0.bb | 2 | ||||
-rw-r--r-- | meta/recipes-support/libfm/libfm-extra_1.2.3.bb | 2 | ||||
-rw-r--r-- | meta/recipes-support/libfm/libfm_1.2.3.bb | 2 | ||||
-rw-r--r-- | meta/recipes-support/pinentry/pinentry_0.9.2.bb | 2 |
13 files changed, 14 insertions, 12 deletions
diff --git a/meta/recipes-connectivity/connman/connman-gnome_0.7.bb b/meta/recipes-connectivity/connman/connman-gnome_0.7.bb index 0fd1c65a3b..7b875f00f9 100644 --- a/meta/recipes-connectivity/connman/connman-gnome_0.7.bb +++ b/meta/recipes-connectivity/connman/connman-gnome_0.7.bb | |||
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ | |||
6 | file://properties/main.c;beginline=1;endline=20;md5=50c77c81871308b033ab7a1504626afb \ | 6 | file://properties/main.c;beginline=1;endline=20;md5=50c77c81871308b033ab7a1504626afb \ |
7 | file://common/connman-dbus.c;beginline=1;endline=20;md5=de6b485c0e717a0236402d220187717a" | 7 | file://common/connman-dbus.c;beginline=1;endline=20;md5=de6b485c0e717a0236402d220187717a" |
8 | 8 | ||
9 | DEPENDS = "gtk+ dbus-glib intltool-native" | 9 | DEPENDS = "gtk+ dbus-glib intltool-native gettext-native" |
10 | 10 | ||
11 | # 0.7 tag | 11 | # 0.7 tag |
12 | SRCREV = "cf3c325b23dae843c5499a113591cfbc98acb143" | 12 | SRCREV = "cf3c325b23dae843c5499a113591cfbc98acb143" |
diff --git a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb index 95d5e554d6..7c3a87e872 100644 --- a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb +++ b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb | |||
@@ -6,7 +6,7 @@ LICENSE = "LGPLv2.1" | |||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" |
7 | 7 | ||
8 | SECTION = "x11/base" | 8 | SECTION = "x11/base" |
9 | DEPENDS = "intltool-native gtk+" | 9 | DEPENDS = "intltool-native gtk+ gettext-native" |
10 | 10 | ||
11 | PR = "r3" | 11 | PR = "r3" |
12 | 12 | ||
diff --git a/meta/recipes-gnome/libsecret/libsecret_0.18.2.bb b/meta/recipes-gnome/libsecret/libsecret_0.18.2.bb index cebc83b574..ac84cb1a1a 100644 --- a/meta/recipes-gnome/libsecret/libsecret_0.18.2.bb +++ b/meta/recipes-gnome/libsecret/libsecret_0.18.2.bb | |||
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=23c2a5e0106b99d75238986559bb5fc6" | |||
4 | 4 | ||
5 | inherit gnomebase gtk-doc | 5 | inherit gnomebase gtk-doc |
6 | 6 | ||
7 | DEPENDS = "glib-2.0 libgcrypt" | 7 | DEPENDS = "glib-2.0 libgcrypt gettext-native" |
8 | 8 | ||
9 | EXTRA_OECONF += "--disable-manpages" | 9 | EXTRA_OECONF += "--disable-manpages" |
10 | 10 | ||
diff --git a/meta/recipes-graphics/xorg-app/xwininfo_1.1.3.bb b/meta/recipes-graphics/xorg-app/xwininfo_1.1.3.bb index 7a452410b7..0c23d19437 100644 --- a/meta/recipes-graphics/xorg-app/xwininfo_1.1.3.bb +++ b/meta/recipes-graphics/xorg-app/xwininfo_1.1.3.bb | |||
@@ -7,7 +7,7 @@ windows. Information may include window position, size, color depth, \ | |||
7 | and a number of other items." | 7 | and a number of other items." |
8 | 8 | ||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=78976cd3115f6faf615accc4e094d90e" | 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=78976cd3115f6faf615accc4e094d90e" |
10 | DEPENDS += "libxext libxmu" | 10 | DEPENDS += "libxext libxmu gettext-native" |
11 | 11 | ||
12 | PE = "0" | 12 | PE = "0" |
13 | 13 | ||
diff --git a/meta/recipes-kernel/oprofile/oprofileui-server_git.bb b/meta/recipes-kernel/oprofile/oprofileui-server_git.bb index eb3b78b906..cc3477bc7b 100644 --- a/meta/recipes-kernel/oprofile/oprofileui-server_git.bb +++ b/meta/recipes-kernel/oprofile/oprofileui-server_git.bb | |||
@@ -9,7 +9,7 @@ SRC_URI = "git://git.yoctoproject.org/oprofileui \ | |||
9 | file://init \ | 9 | file://init \ |
10 | file://oprofileui-server.service " | 10 | file://oprofileui-server.service " |
11 | 11 | ||
12 | DEPENDS += "intltool-native" | 12 | DEPENDS += "intltool-native gettext-native" |
13 | 13 | ||
14 | EXTRA_OECONF += "--disable-client --enable-server" | 14 | EXTRA_OECONF += "--disable-client --enable-server" |
15 | 15 | ||
diff --git a/meta/recipes-kernel/oprofile/oprofileui_git.bb b/meta/recipes-kernel/oprofile/oprofileui_git.bb index 8fad099664..86f3d8e50e 100644 --- a/meta/recipes-kernel/oprofile/oprofileui_git.bb +++ b/meta/recipes-kernel/oprofile/oprofileui_git.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | require oprofileui.inc | 1 | require oprofileui.inc |
2 | 2 | ||
3 | DEPENDS += "gtk+ libglade libxml2 avahi-ui gconf" | 3 | DEPENDS += "gtk+ libglade libxml2 avahi-ui gconf gettext-native" |
4 | 4 | ||
5 | inherit distro_features_check | 5 | inherit distro_features_check |
6 | ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" | 6 | ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" |
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)}" |
diff --git a/meta/recipes-support/atk/at-spi2-core_2.16.0.bb b/meta/recipes-support/atk/at-spi2-core_2.16.0.bb index 933cbe70f7..7c12b54289 100644 --- a/meta/recipes-support/atk/at-spi2-core_2.16.0.bb +++ b/meta/recipes-support/atk/at-spi2-core_2.16.0.bb | |||
@@ -11,7 +11,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ | |||
11 | SRC_URI[md5sum] = "be6eeea370f913b7639b609913b2cf02" | 11 | SRC_URI[md5sum] = "be6eeea370f913b7639b609913b2cf02" |
12 | SRC_URI[sha256sum] = "1c0b77fb8ce81abbf1d80c0afee9858b3f9229f673b7881995fe0fc16b1a74d0" | 12 | SRC_URI[sha256sum] = "1c0b77fb8ce81abbf1d80c0afee9858b3f9229f673b7881995fe0fc16b1a74d0" |
13 | 13 | ||
14 | DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst intltool-native" | 14 | DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst intltool-native gettext-native" |
15 | 15 | ||
16 | inherit autotools gtk-doc pkgconfig distro_features_check | 16 | inherit autotools gtk-doc pkgconfig distro_features_check |
17 | # depends on virtual/libx11 | 17 | # depends on virtual/libx11 |
diff --git a/meta/recipes-support/libfm/libfm-extra_1.2.3.bb b/meta/recipes-support/libfm/libfm-extra_1.2.3.bb index 46d2d62b94..36752692b2 100644 --- a/meta/recipes-support/libfm/libfm-extra_1.2.3.bb +++ b/meta/recipes-support/libfm/libfm-extra_1.2.3.bb | |||
@@ -5,7 +5,7 @@ LICENSE = "LGPLv2+" | |||
5 | LIC_FILES_CHKSUM = "file://src/fm-extra.h;beginline=8;endline=21;md5=ef1f84da64b3c01cca447212f7ef6007" | 5 | LIC_FILES_CHKSUM = "file://src/fm-extra.h;beginline=8;endline=21;md5=ef1f84da64b3c01cca447212f7ef6007" |
6 | 6 | ||
7 | SECTION = "x11/libs" | 7 | SECTION = "x11/libs" |
8 | DEPENDS = "glib-2.0 intltool-native" | 8 | DEPENDS = "glib-2.0 intltool-native gettext-native" |
9 | 9 | ||
10 | SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz \ | 10 | SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz \ |
11 | file://0001-nls.m4-Take-it-from-gettext-0.15.patch \ | 11 | file://0001-nls.m4-Take-it-from-gettext-0.15.patch \ |
diff --git a/meta/recipes-support/libfm/libfm_1.2.3.bb b/meta/recipes-support/libfm/libfm_1.2.3.bb index b225232f39..e9ff6569c0 100644 --- a/meta/recipes-support/libfm/libfm_1.2.3.bb +++ b/meta/recipes-support/libfm/libfm_1.2.3.bb | |||
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ | |||
9 | 9 | ||
10 | 10 | ||
11 | SECTION = "x11/libs" | 11 | SECTION = "x11/libs" |
12 | DEPENDS = "glib-2.0 pango gtk+ menu-cache intltool-native libexif libfm-extra" | 12 | DEPENDS = "glib-2.0 pango gtk+ menu-cache intltool-native libexif libfm-extra gettext-native" |
13 | 13 | ||
14 | SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz" | 14 | SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz" |
15 | 15 | ||
diff --git a/meta/recipes-support/pinentry/pinentry_0.9.2.bb b/meta/recipes-support/pinentry/pinentry_0.9.2.bb index c836ca4b86..d6b7130208 100644 --- a/meta/recipes-support/pinentry/pinentry_0.9.2.bb +++ b/meta/recipes-support/pinentry/pinentry_0.9.2.bb | |||
@@ -10,6 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=cbbd794e2a0a289b9dfcc9f513d1996e" | |||
10 | 10 | ||
11 | inherit autotools | 11 | inherit autotools |
12 | 12 | ||
13 | DEPENDS = "gettext-native" | ||
14 | |||
13 | SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2" | 15 | SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2" |
14 | 16 | ||
15 | SRC_URI[md5sum] = "f51d454f921111b5156a2291cbf70278" | 17 | SRC_URI[md5sum] = "f51d454f921111b5156a2291cbf70278" |