Skip to contentSkip to conversation

fixes for lower version

PATCH In review Robert Yang 2 participants 6 messages Feb 13, 2015

lore
Share & tools
lore
#0 lore raw

cover fixes for lower version

The following changes since commit 6bf5cbbcac80ee818cc932d69227e70e41ce02d3:

libtool: Fix option parsing performance regression (2015-02-10 22:36:09 +0000)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib rbt/low_version
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/low_version

Robert Yang (3):
coreutils 6.9: fix unknown-configure-option
meta: fix build with gettext 0.16.1
gettext 0.6.1: disable native

 .../connman/connman-gnome_0.7.bb                   |    2 +-
 meta/recipes-core/coreutils/coreutils_6.9.bb       |    2 +-
 meta/recipes-core/gettext/gettext_0.16.1.bb        |    4 +---
 .../gtk-engines/gtk-engines_2.20.2.bb              |    2 +-
 meta/recipes-graphics/xorg-app/xwininfo_1.1.3.bb   |    2 +-
 .../oprofile/oprofileui-server_git.bb              |    2 +-
 meta/recipes-kernel/oprofile/oprofileui_git.bb     |    2 +-
 meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb      |    2 +-
 meta/recipes-sato/pcmanfm/pcmanfm_1.2.3.bb         |    2 +-
 meta/recipes-sato/puzzles/oh-puzzles_git.bb        |    2 +-
 meta/recipes-support/atk/at-spi2-core_2.14.1.bb    |    2 +-
 meta/recipes-support/libfm/libfm-extra_1.2.3.bb    |    2 +-
 meta/recipes-support/libfm/libfm_1.2.3.bb          |    2 +-
 meta/recipes-support/pinentry/pinentry_0.9.0.bb    |    2 ++
 14 files changed, 15 insertions(+), 15 deletions(-)
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/3 coreutils 6.9: fix unknown-configure-option

Fixed:
WARNING: QA Issue: coreutils: configure was passed unrecognised options: --disable-acl [unknown-configure-option]

It doesn't support --enable-acl or --disable-acl, use ac_cv_header_acl_libacl_h to fix the problem.

---
 meta/recipes-core/coreutils/coreutils_6.9.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/coreutils/coreutils_6.9.bb +1 -1
index 7f34e1b..9189426 100644
@@ -37,7 +37,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}
 
 # with, without, depends, rdepends
 #
-PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl,"
+PACKAGECONFIG[acl] = "ac_cv_header_sys_acl_h=yes,ac_cv_header_sys_acl_h=no,acl,"
 
 
 # [ gets a special treatment and is not included in this
Signature · 1 line
1.7.9.5
#2 lore raw

PATCH 2/3 meta: fix build with gettext 0.16.1

In reply to Robert Yang

The gettext 0.16.1 doesn't install any m4 files to sysroot, please see the following commit:

commit 9e10db5bdfe77c0ef2aff2f1cf89958b62c294a1
Author: Christopher Larson <[email protected]>
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.

---
 .../connman/connman-gnome_0.7.bb                   |    2 +-
 .../gtk-engines/gtk-engines_2.20.2.bb              |    2 +-
 meta/recipes-graphics/xorg-app/xwininfo_1.1.3.bb   |    2 +-
 .../oprofile/oprofileui-server_git.bb              |    2 +-
 meta/recipes-kernel/oprofile/oprofileui_git.bb     |    2 +-
 meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb      |    2 +-
 meta/recipes-sato/pcmanfm/pcmanfm_1.2.3.bb         |    2 +-
 meta/recipes-sato/puzzles/oh-puzzles_git.bb        |    2 +-
 meta/recipes-support/atk/at-spi2-core_2.14.1.bb    |    2 +-
 meta/recipes-support/libfm/libfm-extra_1.2.3.bb    |    2 +-
 meta/recipes-support/libfm/libfm_1.2.3.bb          |    2 +-
 meta/recipes-support/pinentry/pinentry_0.9.0.bb    |    2 ++
 12 files changed, 13 insertions(+), 11 deletions(-)
meta/recipes-connectivity/connman/connman-gnome_0.7.bb +1 -1
index f5575d2..b54d703 100644
@@ -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"
meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb +1 -1
index 33b6afe..7ec64b9 100644
@@ -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"
 
meta/recipes-graphics/xorg-app/xwininfo_1.1.3.bb +1 -1
index 7a45241..0c23d19 100644
@@ -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"
 
meta/recipes-kernel/oprofile/oprofileui-server_git.bb +1 -1
index eb3b78b..cc3477b 100644
@@ -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"
 
meta/recipes-kernel/oprofile/oprofileui_git.bb +1 -1
index bb69d54..7fbc03d 100644
@@ -1,6 +1,6 @@
 require oprofileui.inc
 
-DEPENDS += "gtk+ libglade libxml2 avahi-ui gconf"
+DEPENDS += "gtk+ libglade libxml2 avahi-ui gconf gettext-native"
 
 SRCREV = "389e1875af4721d52c7e65cf9cfffb69b0ed6a59"
 PV = "0.0+git${SRCPV}"
meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb +1 -1
index 830c053..711fe1d 100644
@@ -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"
+DEPENDS = "gtk+ intltool-native gettext-native"
 DEPENDS_append_poky = " libowl"
 SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
 	   file://leafpad.desktop"
meta/recipes-sato/pcmanfm/pcmanfm_1.2.3.bb +1 -1
index 14f58ae..ad1acf7 100644
@@ -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"
 
 
meta/recipes-sato/puzzles/oh-puzzles_git.bb +1 -1
index bd762e9..b99f5e6 100644
@@ -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"
 DEPENDS_append_poky = " libowl"
 
 SRCREV = "92f1a20e4b72eed7a35b00984d9793b51dc2fb3b"
meta/recipes-support/atk/at-spi2-core_2.14.1.bb +1 -1
index 8d01124..0a06475 100644
@@ -9,7 +9,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz"
 SRC_URI[md5sum] = "a37993cc50d90465c9aeed95e2ac439a"
 SRC_URI[sha256sum] = "eef9660b14fdf0fb1f30d1be7c72d591fa7cbb87b00ca3a444425712f46ce657"
 
-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
 
meta/recipes-support/libfm/libfm-extra_1.2.3.bb +1 -1
index 85bcc3c..aab6e6d 100644
@@ -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"
 
meta/recipes-support/libfm/libfm_1.2.3.bb +1 -1
index 629502f..aa48fb9 100644
@@ -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"
 
meta/recipes-support/pinentry/pinentry_0.9.0.bb +2 -0
index 10b329b..6338597 100644
@@ -12,6 +12,8 @@ PR = "r1"
 
 inherit autotools
 
+DEPENDS = "gettext-native"
+
 SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2"
 
 SRC_URI[md5sum] = "40a05856cb3accf6679987b7899b0f5a"
Signature · 1 line
1.7.9.5
#3 lore raw

PATCH 3/3 gettext 0.6.1: disable native

In reply to Robert Yang

ERROR: The recipe gettext-native is trying to install files into a shared area when those files already exist. Those files and their manifest location are:
sysroots/x86_64-linux/usr/share/gettext/config.rpath
Matched in manifest-x86_64-gettext-minimal-native.populate_sysroot
sysroots/x86_64-linux/usr/share/gettext/po/remove-potcdate.sin
Matched in manifest-x86_64-gettext-minimal-native.populate_sysroot
sysroots/x86_64-linux/usr/share/gettext/po/Makefile.in.in
Matched in manifest-x86_64-gettext-minimal-native.populate_sysroot
Please verify which recipe should provide the above files.

We have 0.19.4, so disable it rather than fix.

---
 meta/recipes-core/gettext/gettext_0.16.1.bb |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
meta/recipes-core/gettext/gettext_0.16.1.bb +1 -3
index 892194c..97acf7b 100644
@@ -7,9 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9ea3144f04c41cd2eada5d3f472e6ea5"
 
 PR = "r6"
 DEPENDS = "virtual/libiconv"
-DEPENDS_class-native = ""
 PROVIDES = "virtual/libintl virtual/gettext"
-PROVIDES_class-native = ""
 
 SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
            file://gettext-vpath.patch \
@@ -106,4 +104,4 @@ remove_sysroot_m4_macros () {
     rm -r "${SYSROOT_DESTDIR}${datadir}/aclocal"
 }
 
-BBCLASSEXTEND = "native nativesdk"
+BBCLASSEXTEND = "nativesdk"
Signature · 1 line
1.7.9.5
#4 lore raw

Re: [PATCH 3/3] gettext 0.6.1: disable native

Hi Robert,

you mised a 1 in the subject:

[OE-core] [PATCH 3/3] gettext 0.6.1: disable native

                              ^^^

Bye Henning

#5 lore raw

Re: [PATCH 3/3] gettext 0.6.1: disable native

Quoted 5 lines · Henning Heinold

Hi Robert,

you mised a 1 in the subject:

[OE-core] [PATCH 3/3] gettext 0.6.1: disable native

Thanks, updated to 0.16.1 in the repo.

// Robert

Quoted 4 lines
                               ^^^

Bye Henning