Patchwork [1/5] diffutils: fix libc overrides

login
register
mail settings
Submitter Koen Kooi
Date May 18, 2011, 1:44 p.m.
Message ID <1305726289-9546-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/4341/
State New, archived
Headers show

Comments

Koen Kooi - May 18, 2011, 1:44 p.m.
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/recipes-extended/diffutils/diffutils_2.8.1.bb |    2 +-
 meta/recipes-extended/diffutils/diffutils_3.0.bb   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Saul Wold - May 20, 2011, 1:02 a.m.
On 05/18/2011 06:44 AM, Koen Kooi wrote:
> Signed-off-by: Koen Kooi<koen@dominion.thruhere.net>
> ---
>   meta/recipes-extended/diffutils/diffutils_2.8.1.bb |    2 +-
>   meta/recipes-extended/diffutils/diffutils_3.0.bb   |    2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-extended/diffutils/diffutils_2.8.1.bb b/meta/recipes-extended/diffutils/diffutils_2.8.1.bb
> index 9489b35..0fb3a31 100644
> --- a/meta/recipes-extended/diffutils/diffutils_2.8.1.bb
> +++ b/meta/recipes-extended/diffutils/diffutils_2.8.1.bb
> @@ -20,7 +20,7 @@ inherit autotools update-alternatives gettext
>   # standard functionality.  regex.c actually breaks compilation
>   # because it uses __mempcpy, there are other things (TBD:
>   # see diffutils.mk in buildroot)
> -EXTRA_OECONF_linux-uclibc = "--without-included-regex"
> +EXTRA_OECONF_libc-uclibc = "--without-included-regex"
>
>   ALTERNATIVE_LINKS = "${bindir}/diff ${bindir}/cmp"
>   ALTERNATIVE_PRIORITY = "100"
> diff --git a/meta/recipes-extended/diffutils/diffutils_3.0.bb b/meta/recipes-extended/diffutils/diffutils_3.0.bb
> index 427efdf..ecff5cc 100644
> --- a/meta/recipes-extended/diffutils/diffutils_3.0.bb
> +++ b/meta/recipes-extended/diffutils/diffutils_3.0.bb
> @@ -16,7 +16,7 @@ inherit autotools update-alternatives gettext
>   # standard functionality.  regex.c actually breaks compilation
>   # because it uses __mempcpy, there are other things (TBD:
>   # see diffutils.mk in buildroot)
> -EXTRA_OECONF_linux-uclibc = "--without-included-regex"
> +EXTRA_OECONF_libc-uclibc = "--without-included-regex"
>
>   ALTERNATIVE_LINKS = "${bindir}/diff ${bindir}/cmp"
>   ALTERNATIVE_PRIORITY = "100"

This along with the other 4 were merged into oe-core

Thanks
	Sau!

Patch

diff --git a/meta/recipes-extended/diffutils/diffutils_2.8.1.bb b/meta/recipes-extended/diffutils/diffutils_2.8.1.bb
index 9489b35..0fb3a31 100644
--- a/meta/recipes-extended/diffutils/diffutils_2.8.1.bb
+++ b/meta/recipes-extended/diffutils/diffutils_2.8.1.bb
@@ -20,7 +20,7 @@  inherit autotools update-alternatives gettext
 # standard functionality.  regex.c actually breaks compilation
 # because it uses __mempcpy, there are other things (TBD:
 # see diffutils.mk in buildroot)
-EXTRA_OECONF_linux-uclibc = "--without-included-regex"
+EXTRA_OECONF_libc-uclibc = "--without-included-regex"
 
 ALTERNATIVE_LINKS = "${bindir}/diff ${bindir}/cmp"
 ALTERNATIVE_PRIORITY = "100"
diff --git a/meta/recipes-extended/diffutils/diffutils_3.0.bb b/meta/recipes-extended/diffutils/diffutils_3.0.bb
index 427efdf..ecff5cc 100644
--- a/meta/recipes-extended/diffutils/diffutils_3.0.bb
+++ b/meta/recipes-extended/diffutils/diffutils_3.0.bb
@@ -16,7 +16,7 @@  inherit autotools update-alternatives gettext
 # standard functionality.  regex.c actually breaks compilation
 # because it uses __mempcpy, there are other things (TBD:
 # see diffutils.mk in buildroot)
-EXTRA_OECONF_linux-uclibc = "--without-included-regex"
+EXTRA_OECONF_libc-uclibc = "--without-included-regex"
 
 ALTERNATIVE_LINKS = "${bindir}/diff ${bindir}/cmp"
 ALTERNATIVE_PRIORITY = "100"