Patchwork [4/4] acl, attr: Fix build failures when NLS is disabled on uclibc

login
register
mail settings
Submitter Khem Raj
Date July 16, 2011, 1:59 a.m.
Message ID <ae375ddeb4e1c4e3141e41fe01a78d196d9d6970.1310781382.git.raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/7703/
State New, archived
Headers show

Comments

Khem Raj - July 16, 2011, 1:59 a.m.
Disable gettext support when NLS is not enabled

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-support/attr/acl_2.2.51.bb  |    2 +-
 meta/recipes-support/attr/attr.inc       |    4 ----
 meta/recipes-support/attr/attr_2.4.46.bb |    2 +-
 meta/recipes-support/attr/ea-acl.inc     |    4 ++++
 4 files changed, 6 insertions(+), 6 deletions(-)
Khem Raj - July 16, 2011, 2:46 a.m.
On Fri, Jul 15, 2011 at 6:59 PM, Khem Raj <raj.khem@gmail.com> wrote:
> Disable gettext support when NLS is not enabled

hold on to this patch there I found problems building from scratch on acl-native
I am fixing it. Other patches in the series are ok.

>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  meta/recipes-support/attr/acl_2.2.51.bb  |    2 +-
>  meta/recipes-support/attr/attr.inc       |    4 ----
>  meta/recipes-support/attr/attr_2.4.46.bb |    2 +-
>  meta/recipes-support/attr/ea-acl.inc     |    4 ++++
>  4 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/meta/recipes-support/attr/acl_2.2.51.bb b/meta/recipes-support/attr/acl_2.2.51.bb
> index 301d44a..18aac7c 100644
> --- a/meta/recipes-support/attr/acl_2.2.51.bb
> +++ b/meta/recipes-support/attr/acl_2.2.51.bb
> @@ -1,6 +1,6 @@
>  require acl.inc
>
> -PR = "r0"
> +PR = "r1"
>
>  SRC_URI[md5sum] = "3fc0ce99dc5253bdcce4c9cd437bc267"
>  SRC_URI[sha256sum] = "06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225"
> diff --git a/meta/recipes-support/attr/attr.inc b/meta/recipes-support/attr/attr.inc
> index b2ed9a1..c110340 100644
> --- a/meta/recipes-support/attr/attr.inc
> +++ b/meta/recipes-support/attr/attr.inc
> @@ -20,7 +20,3 @@ do_install_append() {
>        sed -i ${D}${libdir}/libattr.la -e \
>            s,^libdir=\'${base_libdir}\'$,libdir=\'${libdir}\',
>  }
> -
> -# Only append ldflags for target recipe
> -LDFLAGS_libc-uclibc += "${@['', '-lintl']['${PN}' == '${BPN}']}"
> -
> diff --git a/meta/recipes-support/attr/attr_2.4.46.bb b/meta/recipes-support/attr/attr_2.4.46.bb
> index 9fef41b..fe8ab79 100644
> --- a/meta/recipes-support/attr/attr_2.4.46.bb
> +++ b/meta/recipes-support/attr/attr_2.4.46.bb
> @@ -1,6 +1,6 @@
>  require attr.inc
>
> -PR = "r0"
> +PR = "r1"
>
>  SRC_URI[md5sum] = "db557c17fdfa4f785333ecda08654010"
>  SRC_URI[sha256sum] = "dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f"
> diff --git a/meta/recipes-support/attr/ea-acl.inc b/meta/recipes-support/attr/ea-acl.inc
> index afe2f1c..96dc0fb 100644
> --- a/meta/recipes-support/attr/ea-acl.inc
> +++ b/meta/recipes-support/attr/ea-acl.inc
> @@ -32,3 +32,7 @@ FILES_lib${PN}-doc = "${mandir}/man2 \
>                       ${mandir}/man3"
>
>  BBCLASSEXTEND = "native"
> +# Only append ldflags for target recipe and if USE_NLS is enabled
> +LDFLAGS_libc-uclibc += "${@['', '-lintl'][(bb.data.getVar('PN', d, True) == bb.data.getVar('BPN', d , True)) and (bb.data.getVar('USE_NLS', d, True) == 'yes')]}"
> +EXTRA_OECONF_append_libc-uclibc = "${@[' --disable-gettext ', ' --enable-gettext '][(bb.data.getVar('PN', d, True) == bb.data.getVar('BPN', d , True)) and (bb.data.getVar('USE_NLS', d, True) == 'yes')]}"
> +
> --
> 1.7.4.1
>
>

Patch

diff --git a/meta/recipes-support/attr/acl_2.2.51.bb b/meta/recipes-support/attr/acl_2.2.51.bb
index 301d44a..18aac7c 100644
--- a/meta/recipes-support/attr/acl_2.2.51.bb
+++ b/meta/recipes-support/attr/acl_2.2.51.bb
@@ -1,6 +1,6 @@ 
 require acl.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI[md5sum] = "3fc0ce99dc5253bdcce4c9cd437bc267"
 SRC_URI[sha256sum] = "06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225"
diff --git a/meta/recipes-support/attr/attr.inc b/meta/recipes-support/attr/attr.inc
index b2ed9a1..c110340 100644
--- a/meta/recipes-support/attr/attr.inc
+++ b/meta/recipes-support/attr/attr.inc
@@ -20,7 +20,3 @@  do_install_append() {
 	sed -i ${D}${libdir}/libattr.la -e \
 	    s,^libdir=\'${base_libdir}\'$,libdir=\'${libdir}\',
 }
-
-# Only append ldflags for target recipe
-LDFLAGS_libc-uclibc += "${@['', '-lintl']['${PN}' == '${BPN}']}"
-
diff --git a/meta/recipes-support/attr/attr_2.4.46.bb b/meta/recipes-support/attr/attr_2.4.46.bb
index 9fef41b..fe8ab79 100644
--- a/meta/recipes-support/attr/attr_2.4.46.bb
+++ b/meta/recipes-support/attr/attr_2.4.46.bb
@@ -1,6 +1,6 @@ 
 require attr.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI[md5sum] = "db557c17fdfa4f785333ecda08654010"
 SRC_URI[sha256sum] = "dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f"
diff --git a/meta/recipes-support/attr/ea-acl.inc b/meta/recipes-support/attr/ea-acl.inc
index afe2f1c..96dc0fb 100644
--- a/meta/recipes-support/attr/ea-acl.inc
+++ b/meta/recipes-support/attr/ea-acl.inc
@@ -32,3 +32,7 @@  FILES_lib${PN}-doc = "${mandir}/man2 \
                       ${mandir}/man3"
 
 BBCLASSEXTEND = "native"
+# Only append ldflags for target recipe and if USE_NLS is enabled
+LDFLAGS_libc-uclibc += "${@['', '-lintl'][(bb.data.getVar('PN', d, True) == bb.data.getVar('BPN', d , True)) and (bb.data.getVar('USE_NLS', d, True) == 'yes')]}"
+EXTRA_OECONF_append_libc-uclibc = "${@[' --disable-gettext ', ' --enable-gettext '][(bb.data.getVar('PN', d, True) == bb.data.getVar('BPN', d , True)) and (bb.data.getVar('USE_NLS', d, True) == 'yes')]}"
+