Patchwork [2/2] gcc: fix DEPENDS to avoid a build issue

login
register
mail settings
Submitter Nitin A Kamble
Date May 16, 2012, 6:11 p.m.
Message ID <d5ffec3f9f188123a6afd282109f33417994b8d9.1337191798.git.nitin.a.kamble@intel.com>
Download mbox | patch
Permalink /patch/27841/
State New
Headers show

Comments

Nitin A Kamble - May 16, 2012, 6:11 p.m.
From: Nitin A Kamble <nitin.a.kamble@intel.com>

this commits avoids this issue:

| 4.7.0+svnr186651-r1/gcc-4_7-branch/libgcc/. -I/home/nitin/builds/build0/tmp/work-shared/gcc-4.7.0+svnr186651-r1/gc
c-4_7-branch/libgcc/../gcc -I/home/nitin/builds/build0/tmp/work-shared/gcc-4.7.0+svnr186651-r1/gcc-4_7-branch/libgcc
/../include -I/home/nitin/builds/build0/tmp/work-shared/gcc-4.7.0+svnr186651-r1/gcc-4_7-branch/libgcc/config/libbid
-DENABLE_DECIMAL_BID_FORMAT -DHAVE_CC_TLS  -DUSE_TLS -o _fixdfdi_s.o -MT _fixdfdi_s.o -MD -MP -MF _fixdfdi_s.dep -DS
HARED -DL_fixdfdi -c /home/nitin/builds/build0/tmp/work-shared/gcc-4.7.0+svnr186651-r1/gcc-4_7-branch/libgcc/libgcc2
.c
| /home/nitin/builds/build0/tmp/work-shared/gcc-4.7.0+svnr186651-r1/gcc-4_7-branch/libgcc/unwind-dw2.c:42:21: fatal
error: sys/sdt.h: No such file or directory
| compilation terminated.
| make[2]: *** [unwind-dw2.o] Error 1
| make[2]: *** Waiting for unfinished jobs....
| make[2]: Leaving directory `/home/nitin/builds/build0/tmp/work/i586-poky-linux/gcc-4.7.0+svnr186651-r1/gcc-4_7-branch/build.i586-poky-linux.i586-poky-linux/i586-poky-linux/libgcc'
| make[1]: *** [all-target-libgcc] Error 2
| make[1]: Leaving directory `/home/nitin/builds/build0/tmp/work/i586-poky-linux/gcc-4.7.0+svnr186651-r1/gcc-4_7-branch/build.i586-poky-linux.i586-poky-linux'
| make: *** [all] Error 2
| ERROR: oe_runmake failed
NOTE: package gcc-4.7.0+svnr186651-r1: task do_compile: Failed
ERROR: Task 8 (/home/nitin/prj/poky.git/meta/recipes-devtools/gcc/gcc_4.7.bb, do_compile) failed with exit code '1'
NOTE: Tasks Summary: Attempted 808 tasks of which 801 didn't need to be rerun and 1 failed.

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 meta/recipes-devtools/gcc/gcc-4.7.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Saul Wold - May 16, 2012, 6:52 p.m.
On 05/16/2012 09:11 PM, nitin.a.kamble@intel.com wrote:
> From: Nitin A Kamble<nitin.a.kamble@intel.com>
>
> this commits avoids this issue:
>
> | 4.7.0+svnr186651-r1/gcc-4_7-branch/libgcc/. -I/home/nitin/builds/build0/tmp/work-shared/gcc-4.7.0+svnr186651-r1/gc
> c-4_7-branch/libgcc/../gcc -I/home/nitin/builds/build0/tmp/work-shared/gcc-4.7.0+svnr186651-r1/gcc-4_7-branch/libgcc
> /../include -I/home/nitin/builds/build0/tmp/work-shared/gcc-4.7.0+svnr186651-r1/gcc-4_7-branch/libgcc/config/libbid
> -DENABLE_DECIMAL_BID_FORMAT -DHAVE_CC_TLS  -DUSE_TLS -o _fixdfdi_s.o -MT _fixdfdi_s.o -MD -MP -MF _fixdfdi_s.dep -DS
> HARED -DL_fixdfdi -c /home/nitin/builds/build0/tmp/work-shared/gcc-4.7.0+svnr186651-r1/gcc-4_7-branch/libgcc/libgcc2
> .c
> | /home/nitin/builds/build0/tmp/work-shared/gcc-4.7.0+svnr186651-r1/gcc-4_7-branch/libgcc/unwind-dw2.c:42:21: fatal
> error: sys/sdt.h: No such file or directory
> | compilation terminated.
> | make[2]: *** [unwind-dw2.o] Error 1
> | make[2]: *** Waiting for unfinished jobs....
> | make[2]: Leaving directory `/home/nitin/builds/build0/tmp/work/i586-poky-linux/gcc-4.7.0+svnr186651-r1/gcc-4_7-branch/build.i586-poky-linux.i586-poky-linux/i586-poky-linux/libgcc'
> | make[1]: *** [all-target-libgcc] Error 2
> | make[1]: Leaving directory `/home/nitin/builds/build0/tmp/work/i586-poky-linux/gcc-4.7.0+svnr186651-r1/gcc-4_7-branch/build.i586-poky-linux.i586-poky-linux'
> | make: *** [all] Error 2
> | ERROR: oe_runmake failed
> NOTE: package gcc-4.7.0+svnr186651-r1: task do_compile: Failed
> ERROR: Task 8 (/home/nitin/prj/poky.git/meta/recipes-devtools/gcc/gcc_4.7.bb, do_compile) failed with exit code '1'
> NOTE: Tasks Summary: Attempted 808 tasks of which 801 didn't need to be rerun and 1 failed.
>
> Signed-off-by: Nitin A Kamble<nitin.a.kamble@intel.com>
> ---
>   meta/recipes-devtools/gcc/gcc-4.7.inc |    4 ++--
>   1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-devtools/gcc/gcc-4.7.inc b/meta/recipes-devtools/gcc/gcc-4.7.inc
> index 8adeb8d..9c73235 100644
> --- a/meta/recipes-devtools/gcc/gcc-4.7.inc
> +++ b/meta/recipes-devtools/gcc/gcc-4.7.inc
> @@ -1,6 +1,6 @@
>   require gcc-common.inc
>
> -PR = "r1"
> +PR = "r2"
>
>   # Third digit in PV should be incremented after a minor release
>   # happens from this branch on gcc e.g. currently its 4.7.0
> @@ -22,7 +22,7 @@ SRCREV = "186651"
>   BRANCH = "gcc-4_7-branch"
>   FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/gcc-4.7' ], d)}"
>
> -DEPENDS =+ "mpfr gmp libmpc"
> +DEPENDS =+ "mpfr gmp libmpc systemtap"

Nitin,

I am not sure this is the right way to do this, first it's bringing in 
another dependency into gcc, it also will cause a mips failure as 
systemtap does not build with mips.

It might be better to modify the configuration to ensure that system tap 
is always disabled.  This will ensure a deterministic build.

Sau!
>   NATIVEDEPS = "mpfr-native gmp-native libmpc-native zlib-native"
>
>   LICENSE="GPL-3.0-with-GCC-exception&  GPLv3"
Khem Raj - May 16, 2012, 7:12 p.m.
On Wednesday, May 16, 2012, Saul Wold <sgw@linux.intel.com> wrote:
> On 05/16/2012 09:11 PM, nitin.a.kamble@intel.com wrote:
>>
>> From: Nitin A Kamble<nitin.a.kamble@intel.com>
>>
>> this commits avoids this issue:
>>
>> | 4.7.0+svnr186651-r1/gcc-4_7-branch/libgcc/.
-I/home/nitin/builds/build0/tmp/work-shared/gcc-4.7.0+svnr186651-r1/gc
>> c-4_7-branch/libgcc/../gcc
-I/home/nitin/builds/build0/tmp/work-shared/gcc-4.7.0+svnr186651-r1/gcc-4_7-branch/libgcc
>> /../include
-I/home/nitin/builds/build0/tmp/work-shared/gcc-4.7.0+svnr186651-r1/gcc-4_7-branch/libgcc/config/libbid
>> -DENABLE_DECIMAL_BID_FORMAT -DHAVE_CC_TLS  -DUSE_TLS -o _fixdfdi_s.o -MT
_fixdfdi_s.o -MD -MP -MF _fixdfdi_s.dep -DS
>> HARED -DL_fixdfdi -c
/home/nitin/builds/build0/tmp/work-shared/gcc-4.7.0+svnr186651-r1/gcc-4_7-branch/libgcc/libgcc2
>> .c
>> |
/home/nitin/builds/build0/tmp/work-shared/gcc-4.7.0+svnr186651-r1/gcc-4_7-branch/libgcc/unwind-dw2.c:42:21:
fatal
>> error: sys/sdt.h: No such file or directory
>> | compilation terminated.
>> | make[2]: *** [unwind-dw2.o] Error 1
>> | make[2]: *** Waiting for unfinished jobs....
>> | make[2]: Leaving directory
`/home/nitin/builds/build0/tmp/work/i586-poky-linux/gcc-4.7.0+svnr186651-r1/gcc-4_7-branch/build.i586-poky-linux.i586-poky-linux/i586-poky-linux/libgcc'
>> | make[1]: *** [all-target-libgcc] Error 2
>> | make[1]: Leaving directory
`/home/nitin/builds/build0/tmp/work/i586-poky-linux/gcc-4.7.0+svnr186651-r1/gcc-4_7-branch/build.i586-poky-linux.i586-poky-linux'
>> | make: *** [all] Error 2
>> | ERROR: oe_runmake failed
>> NOTE: package gcc-4.7.0+svnr186651-r1: task do_compile: Failed
>> ERROR: Task 8 (/home/nitin/prj/poky.git/meta/recipes-devtools/gcc/
gcc_4.7.bb, do_compile) failed with exit code '1'
>> NOTE: Tasks Summary: Attempted 808 tasks of which 801 didn't need to be
rerun and 1 failed.
>>
>> Signed-off-by: Nitin A Kamble<nitin.a.kamble@intel.com>
>> ---
>>  meta/recipes-devtools/gcc/gcc-4.7.inc |    4 ++--
>>  1 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta/recipes-devtools/gcc/gcc-4.7.inc
b/meta/recipes-devtools/gcc/gcc-4.7.inc
>> index 8adeb8d..9c73235 100644
>> --- a/meta/recipes-devtools/gcc/gcc-4.7.inc
>> +++ b/meta/recipes-devtools/gcc/gcc-4.7.inc
>> @@ -1,6 +1,6 @@
>>  require gcc-common.inc
>>
>> -PR = "r1"
>> +PR = "r2"
>>
>>  # Third digit in PV should be incremented after a minor release
>>  # happens from this branch on gcc e.g. currently its 4.7.0
>> @@ -22,7 +22,7 @@ SRCREV = "186651"
>>  BRANCH = "gcc-4_7-branch"
>>  FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/gcc-4.7' ], d)}"
>>
>> -DEPENDS =+ "mpfr gmp libmpc"
>> +DEPENDS =+ "mpfr gmp libmpc systemtap"
>
> Nitin,
>
> I am not sure this is the right way to do this, first it's bringing in
another dependency into gcc, it also will cause a mips failure as systemtap
does not build with mips.
>
> It might be better to modify the configuration to ensure that system tap
is always disabled.  This will ensure a deterministic build.
>

Yes disabling systemtap  is the right thing to do here


> Sau!
>>
>>  NATIVEDEPS = "mpfr-native gmp-native libmpc-native zlib-native"
>>
>>  LICENSE="GPL-3.0-with-GCC-exception&  GPLv3"
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Patch

diff --git a/meta/recipes-devtools/gcc/gcc-4.7.inc b/meta/recipes-devtools/gcc/gcc-4.7.inc
index 8adeb8d..9c73235 100644
--- a/meta/recipes-devtools/gcc/gcc-4.7.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.7.inc
@@ -1,6 +1,6 @@ 
 require gcc-common.inc
 
-PR = "r1"
+PR = "r2"
 
 # Third digit in PV should be incremented after a minor release
 # happens from this branch on gcc e.g. currently its 4.7.0
@@ -22,7 +22,7 @@  SRCREV = "186651"
 BRANCH = "gcc-4_7-branch"
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/gcc-4.7' ], d)}"
 
-DEPENDS =+ "mpfr gmp libmpc"
+DEPENDS =+ "mpfr gmp libmpc systemtap"
 NATIVEDEPS = "mpfr-native gmp-native libmpc-native zlib-native"
 
 LICENSE="GPL-3.0-with-GCC-exception & GPLv3"