[PATCH resend 1/4] make 3.82: set DEFAULT_PREFERENCE = "-1"

[PATCH resend 1/4] make 3.82: set DEFAULT_PREFERENCE = "-1"

[Michael Smith]

This version has introduced several backwards incompatibilities and some
packages are known not to build with 3.82. In particular:

- glibc-initial fails in do_install when prefix="".
- eglibc manual/Makefile has not yet been patched (see 3a06f50f)

Signed-off-by: Michael Smith <msmith@cbnco.com>
---
 recipes/make/make_3.82.bb |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/recipes/make/make_3.82.bb b/recipes/make/make_3.82.bb
index 3cdc0a0..86c58d6 100644
--- a/recipes/make/make_3.82.bb
+++ b/recipes/make/make_3.82.bb
@@ -1,5 +1,8 @@
 require make.inc
 
+# Stock eglibc fails to build with make 3.82.
+DEFAULT_PREFERENCE = "-1"
+
 BBCLASSEXTEND = "native"
 SRC_URI[md5sum] = "1a11100f3c63fcf5753818e59d63088f"
 SRC_URI[sha256sum] = "e2c1a73f179c40c71e2fe8abf8a8a0688b8499538512984da4a76958d0402966"
-- 
1.7.0.4

[PATCH resend 2/4] base.bbclass: add make-native to default dependencies

[Michael Smith]

This should work around package incompatibilities with whatever version
of make is installed on the build system.

Signed-off-by: Michael Smith <msmith@cbnco.com>
---
 classes/base.bbclass |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/classes/base.bbclass b/classes/base.bbclass
index 964fe1c..2e49a3c 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -71,7 +71,8 @@ def base_deps(d):
 	if not bb.data.getVar('INHIBIT_DEFAULT_DEPS', d):
 		if (bb.data.getVar('HOST_SYS', d, 1) !=
 	     	    bb.data.getVar('BUILD_SYS', d, 1)):
-			deps += " virtual/${TARGET_PREFIX}gcc virtual/libc "
+			deps += (" virtual/${TARGET_PREFIX}gcc virtual/libc "
+				"make-native")
 		elif bb.data.inherits_class('native', d) and \
 				bb.data.getVar('PN', d, True) not in \
 				("linux-libc-headers-native", "quilt-native",
-- 
1.7.0.4

[PATCH resend 3/4] glibc, glibc-initial: depend on make-native

[Michael Smith]

In case the version of make installed on the build host is incompatible,
we'll use make-native.

Signed-off-by: Michael Smith <msmith@cbnco.com>
---
 recipes/glibc/glibc-initial.inc |    2 +-
 recipes/glibc/glibc.inc         |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/recipes/glibc/glibc-initial.inc b/recipes/glibc/glibc-initial.inc
index effebf1..c95a161 100644
--- a/recipes/glibc/glibc-initial.inc
+++ b/recipes/glibc/glibc-initial.inc
@@ -1,5 +1,5 @@
 SECTION = "libs"
-DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers"
+DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers make-native"
 PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
 
 PACKAGES = ""
diff --git a/recipes/glibc/glibc.inc b/recipes/glibc/glibc.inc
index f3c0c08..8055442 100644
--- a/recipes/glibc/glibc.inc
+++ b/recipes/glibc/glibc.inc
@@ -4,7 +4,9 @@ SECTION = "libs"
 PRIORITY = "required"
 LICENSE = "LGPL"
 # nptl needs unwind support in gcc, which can't be built without glibc.
-DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers"
+DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate \
+		linux-libc-headers \
+		make-native"
 #this leads to circular deps, so lets not add it yet
 #RDEPENDS_ldd += " bash"
 PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
-- 
1.7.0.4

[PATCH resend 4/4] eglibc, eglibc-initial: depend on make-native

[Michael Smith]

In case the version of make installed on the build host is incompatible,
we'll use make-native.

Signed-off-by: Michael Smith <msmith@cbnco.com>
---
 recipes/eglibc/eglibc-initial.inc |    2 +-
 recipes/eglibc/eglibc.inc         |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/recipes/eglibc/eglibc-initial.inc b/recipes/eglibc/eglibc-initial.inc
index 2a68fd6..935fa3a 100644
--- a/recipes/eglibc/eglibc-initial.inc
+++ b/recipes/eglibc/eglibc-initial.inc
@@ -1,5 +1,5 @@
 SECTION = "libs"
-DEPENDS = "linux-libc-headers virtual/${TARGET_PREFIX}gcc-initial"
+DEPENDS = "linux-libc-headers virtual/${TARGET_PREFIX}gcc-initial make-native"
 PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
 
 PACKAGES = ""
diff --git a/recipes/eglibc/eglibc.inc b/recipes/eglibc/eglibc.inc
index 754a12b..00202d7 100644
--- a/recipes/eglibc/eglibc.inc
+++ b/recipes/eglibc/eglibc.inc
@@ -5,7 +5,9 @@ PRIORITY = "required"
 LICENSE = "LGPL"
 INC_PR = "r15"
 # nptl needs unwind support in gcc, which can't be built without glibc.
-DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers"
+DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate \
+		linux-libc-headers \
+		make-native"
 #this leads to circular deps, so lets not add it yet
 #RDEPENDS_ldd += " bash"
 # nptl needs libgcc but dlopens it, so our shlibs code doesn't detect this
-- 
1.7.0.4

Re: [PATCH resend 1/4] make 3.82: set DEFAULT_PREFERENCE = "-1"

[Michael Smith]

ping

Michael Smith wrote:
> This version has introduced several backwards incompatibilities and some
> packages are known not to build with 3.82. In particular:
> 
> - glibc-initial fails in do_install when prefix="".
> - eglibc manual/Makefile has not yet been patched (see 3a06f50f)
> 
> Signed-off-by: Michael Smith <msmith@cbnco.com>
> ---
>  recipes/make/make_3.82.bb |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)
> 
> diff --git a/recipes/make/make_3.82.bb b/recipes/make/make_3.82.bb
> index 3cdc0a0..86c58d6 100644
> --- a/recipes/make/make_3.82.bb
> +++ b/recipes/make/make_3.82.bb
> @@ -1,5 +1,8 @@
>  require make.inc
>  
> +# Stock eglibc fails to build with make 3.82.
> +DEFAULT_PREFERENCE = "-1"
> +
>  BBCLASSEXTEND = "native"
>  SRC_URI[md5sum] = "1a11100f3c63fcf5753818e59d63088f"
>  SRC_URI[sha256sum] = "e2c1a73f179c40c71e2fe8abf8a8a0688b8499538512984da4a76958d0402966"

Re: [PATCH resend 1/4] make 3.82: set DEFAULT_PREFERENCE = "-1"

[Paul Menzel]

[-- Attachment #1: Type: text/plain, Size: 1137 bytes --]

Am Freitag, den 08.10.2010, 09:39 -0400 schrieb Michael Smith:
> This version has introduced several backwards incompatibilities and some
> packages are known not to build with 3.82. In particular:
> 
> - glibc-initial fails in do_install when prefix="".
> - eglibc manual/Makefile has not yet been patched (see 3a06f50f)

Are there patches for these problems available upstream?

> Signed-off-by: Michael Smith <msmith@cbnco.com>
> ---
>  recipes/make/make_3.82.bb |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)
> 
> diff --git a/recipes/make/make_3.82.bb b/recipes/make/make_3.82.bb
> index 3cdc0a0..86c58d6 100644
> --- a/recipes/make/make_3.82.bb
> +++ b/recipes/make/make_3.82.bb
> @@ -1,5 +1,8 @@
>  require make.inc
>  
> +# Stock eglibc fails to build with make 3.82.

What do you mean by »stock«? The pristine upstream version or the
version in OE?

> +DEFAULT_PREFERENCE = "-1"
> +
>  BBCLASSEXTEND = "native"
>  SRC_URI[md5sum] = "1a11100f3c63fcf5753818e59d63088f"
>  SRC_URI[sha256sum] = "e2c1a73f179c40c71e2fe8abf8a8a0688b8499538512984da4a76958d0402966"


Thanks,

Paul

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH resend 1/4] make 3.82: set DEFAULT_PREFERENCE = "-1"

[Michael Smith]

Paul Menzel wrote:
> Am Freitag, den 08.10.2010, 09:39 -0400 schrieb Michael Smith:
>> This version has introduced several backwards incompatibilities and some
>> packages are known not to build with 3.82. In particular:
>>
>> - glibc-initial fails in do_install when prefix="".
>> - eglibc manual/Makefile has not yet been patched (see 3a06f50f)
> 
> Are there patches for these problems available upstream?

For eglibc, yes. For glibc-initial, no - this one seems like a make bug 
and I don't have time to hunt it down.

>> Signed-off-by: Michael Smith <msmith@cbnco.com>
>> ---
>>  recipes/make/make_3.82.bb |    3 +++
>>  1 files changed, 3 insertions(+), 0 deletions(-)
>>
>> diff --git a/recipes/make/make_3.82.bb b/recipes/make/make_3.82.bb
>> index 3cdc0a0..86c58d6 100644
>> --- a/recipes/make/make_3.82.bb
>> +++ b/recipes/make/make_3.82.bb
>> @@ -1,5 +1,8 @@
>>  require make.inc
>>  
>> +# Stock eglibc fails to build with make 3.82.
> 
> What do you mean by »stock«? The pristine upstream version or the
> version in OE?

The older versions in OE. Later upstream versions might have the patch.

> 
>> +DEFAULT_PREFERENCE = "-1"
>> +
>>  BBCLASSEXTEND = "native"
>>  SRC_URI[md5sum] = "1a11100f3c63fcf5753818e59d63088f"
>>  SRC_URI[sha256sum] = "e2c1a73f179c40c71e2fe8abf8a8a0688b8499538512984da4a76958d0402966"
> 
> 
> Thanks,
> 
> Paul

Re: [PATCH resend 2/4] base.bbclass: add make-native to default dependencies

[Michael Smith]

ping

Michael Smith wrote:
> This should work around package incompatibilities with whatever version
> of make is installed on the build system.
> 
> Signed-off-by: Michael Smith <msmith@cbnco.com>
> ---
>  classes/base.bbclass |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/classes/base.bbclass b/classes/base.bbclass
> index 964fe1c..2e49a3c 100644
> --- a/classes/base.bbclass
> +++ b/classes/base.bbclass
> @@ -71,7 +71,8 @@ def base_deps(d):
>  	if not bb.data.getVar('INHIBIT_DEFAULT_DEPS', d):
>  		if (bb.data.getVar('HOST_SYS', d, 1) !=
>  	     	    bb.data.getVar('BUILD_SYS', d, 1)):
> -			deps += " virtual/${TARGET_PREFIX}gcc virtual/libc "
> +			deps += (" virtual/${TARGET_PREFIX}gcc virtual/libc "
> +				"make-native")
>  		elif bb.data.inherits_class('native', d) and \
>  				bb.data.getVar('PN', d, True) not in \
>  				("linux-libc-headers-native", "quilt-native",