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-support | |
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-support')
-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 |
4 files changed, 5 insertions, 3 deletions
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" |