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 9e10db5bdf
  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>
This commit is contained in:
Robert Yang 2015-09-17 00:46:27 -07:00 committed by Richard Purdie
parent 56c0fdfd43
commit 38f0ffaf43
13 changed files with 14 additions and 12 deletions

View File

@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
file://properties/main.c;beginline=1;endline=20;md5=50c77c81871308b033ab7a1504626afb \
file://common/connman-dbus.c;beginline=1;endline=20;md5=de6b485c0e717a0236402d220187717a"
DEPENDS = "gtk+ dbus-glib intltool-native"
DEPENDS = "gtk+ dbus-glib intltool-native gettext-native"
# 0.7 tag
SRCREV = "cf3c325b23dae843c5499a113591cfbc98acb143"

View File

@ -6,7 +6,7 @@ LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
SECTION = "x11/base"
DEPENDS = "intltool-native gtk+"
DEPENDS = "intltool-native gtk+ gettext-native"
PR = "r3"

View File

@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=23c2a5e0106b99d75238986559bb5fc6"
inherit gnomebase gtk-doc
DEPENDS = "glib-2.0 libgcrypt"
DEPENDS = "glib-2.0 libgcrypt gettext-native"
EXTRA_OECONF += "--disable-manpages"

View File

@ -7,7 +7,7 @@ windows. Information may include window position, size, color depth, \
and a number of other items."
LIC_FILES_CHKSUM = "file://COPYING;md5=78976cd3115f6faf615accc4e094d90e"
DEPENDS += "libxext libxmu"
DEPENDS += "libxext libxmu gettext-native"
PE = "0"

View File

@ -9,7 +9,7 @@ SRC_URI = "git://git.yoctoproject.org/oprofileui \
file://init \
file://oprofileui-server.service "
DEPENDS += "intltool-native"
DEPENDS += "intltool-native gettext-native"
EXTRA_OECONF += "--disable-client --enable-server"

View File

@ -1,6 +1,6 @@
require oprofileui.inc
DEPENDS += "gtk+ libglade libxml2 avahi-ui gconf"
DEPENDS += "gtk+ libglade libxml2 avahi-ui gconf gettext-native"
inherit distro_features_check
ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}"

View File

@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://src/leafpad.h;endline=20;md5=d3d6a89f5e61e8b13bdea537511ba1fa \
file://src/utils.c;endline=20;md5=0d2cc6584ba3202448bb274f62739571"
DEPENDS = "gtk+ intltool-native libowl"
DEPENDS = "gtk+ intltool-native libowl gettext-native"
# The libowl requires x11 in DISTRO_FEATURES
REQUIRED_DISTRO_FEATURES = "x11"

View File

@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
file://src/gseal-gtk-compat.h;endline=21;md5=46922c8691f58d124f9420fe16149ce2"
SECTION = "x11"
DEPENDS = "gtk+ startup-notification libfm intltool-native"
DEPENDS = "gtk+ startup-notification libfm intltool-native gettext-native"
DEPENDS_append_poky = " libowl"

View File

@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=f56ec6772dd1c7c367067bbea8ea1675 \
file://src/tree234.c;endline=28;md5=b4feb1976feebf8f1379093ed52f2945"
SECTION = "x11"
DEPENDS = "gtk+ gconf intltool-native librsvg"
DEPENDS = "gtk+ gconf intltool-native librsvg gettext-native"
# libowl requires x11 in DISTRO_FEATURES
DEPENDS_append_poky = " ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libowl', '', d)}"

View File

@ -11,7 +11,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
SRC_URI[md5sum] = "be6eeea370f913b7639b609913b2cf02"
SRC_URI[sha256sum] = "1c0b77fb8ce81abbf1d80c0afee9858b3f9229f673b7881995fe0fc16b1a74d0"
DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst intltool-native"
DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst intltool-native gettext-native"
inherit autotools gtk-doc pkgconfig distro_features_check
# depends on virtual/libx11

View File

@ -5,7 +5,7 @@ LICENSE = "LGPLv2+"
LIC_FILES_CHKSUM = "file://src/fm-extra.h;beginline=8;endline=21;md5=ef1f84da64b3c01cca447212f7ef6007"
SECTION = "x11/libs"
DEPENDS = "glib-2.0 intltool-native"
DEPENDS = "glib-2.0 intltool-native gettext-native"
SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz \
file://0001-nls.m4-Take-it-from-gettext-0.15.patch \

View File

@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
SECTION = "x11/libs"
DEPENDS = "glib-2.0 pango gtk+ menu-cache intltool-native libexif libfm-extra"
DEPENDS = "glib-2.0 pango gtk+ menu-cache intltool-native libexif libfm-extra gettext-native"
SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz"

View File

@ -10,6 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=cbbd794e2a0a289b9dfcc9f513d1996e"
inherit autotools
DEPENDS = "gettext-native"
SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2"
SRC_URI[md5sum] = "f51d454f921111b5156a2291cbf70278"