summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2013-12-17 19:33:57 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-09 11:04:15 +0000
commit59cf6ae3333bc39b3f3d29e2bfb1f9099d86ac39 (patch)
tree9518f8cfb81e7c0633783d29891b6e0cb9ab5c0e /meta
parent05e1e29c11f82cd6d60f92a3ef8cef1dcaff1325 (diff)
downloadpoky-59cf6ae3333bc39b3f3d29e2bfb1f9099d86ac39.tar.gz
gcc-4.8/libstdc++-v3: disable sdt
We may meet such an error when building gcc/libstdc++-v3: gcc-4.8.1/libstdc++-v3/libsupc++/unwind-cxx.h:41:21: fatal error: sys/sdt.h: No such file or directory We already have a patch to disable the sdt for gcc, we also need disable it for libstdc++-v3. BTW, we need edit both configure.ac and configure to make them keep compatible. NOTE, this commit edit the patch gcc-4.8/0031-Disable-sdt.patch directly. [YOCTO #5657] (From OE-Core master rev: 32854af3cc6c0626620e827dc1915f61c51250b8) (From OE-Core rev: 718932dda21323607fe2bff459babbebcae302c5) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.8/0031-Disable-sdt.patch80
1 files changed, 74 insertions, 6 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0031-Disable-sdt.patch b/meta/recipes-devtools/gcc/gcc-4.8/0031-Disable-sdt.patch
index c714239bea..2c1d5e086b 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0031-Disable-sdt.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.8/0031-Disable-sdt.patch
@@ -1,4 +1,4 @@
1From eb70cb2785af7171897f363298bbfcd83de5ec57 Mon Sep 17 00:00:00 2001 1From b85265bc94ec1beaf1d3b697c03db62991553467 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 Mar 2013 09:28:10 +0400 3Date: Fri, 29 Mar 2013 09:28:10 +0400
4Subject: [PATCH 31/35] Disable sdt. 4Subject: [PATCH 31/35] Disable sdt.
@@ -12,16 +12,23 @@ RP 2012/8/7
12 12
13Signed-off-by: Khem Raj <raj.khem@gmail.com> 13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14 14
15Disable sdt for libstdc++-v3.
16
17Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
18
15Upstream-Status: Inappropriate [hack] 19Upstream-Status: Inappropriate [hack]
16--- 20---
17 gcc/configure | 12 ++++++------ 21 gcc/configure | 12 ++++++------
18 1 file changed, 6 insertions(+), 6 deletions(-) 22 gcc/configure.ac | 18 +++++++++---------
23 libstdc++-v3/configure | 6 +++---
24 libstdc++-v3/configure.ac | 2 +-
25 4 files changed, 19 insertions(+), 19 deletions(-)
19 26
20diff --git a/gcc/configure b/gcc/configure 27diff --git a/gcc/configure b/gcc/configure
21index d587993..8bc0c98 100755 28index 3c550a6..01c7626 100755
22--- a/gcc/configure 29--- a/gcc/configure
23+++ b/gcc/configure 30+++ b/gcc/configure
24@@ -26792,12 +26792,12 @@ fi 31@@ -26812,12 +26812,12 @@ fi
25 { $as_echo "$as_me:${as_lineno-$LINENO}: checking sys/sdt.h in the target C library" >&5 32 { $as_echo "$as_me:${as_lineno-$LINENO}: checking sys/sdt.h in the target C library" >&5
26 $as_echo_n "checking sys/sdt.h in the target C library... " >&6; } 33 $as_echo_n "checking sys/sdt.h in the target C library... " >&6; }
27 have_sys_sdt_h=no 34 have_sys_sdt_h=no
@@ -40,6 +47,67 @@ index d587993..8bc0c98 100755
40 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_sys_sdt_h" >&5 47 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_sys_sdt_h" >&5
41 $as_echo "$have_sys_sdt_h" >&6; } 48 $as_echo "$have_sys_sdt_h" >&6; }
42 49
50diff --git a/gcc/configure.ac b/gcc/configure.ac
51index 3601ab6..06e501f 100644
52--- a/gcc/configure.ac
53+++ b/gcc/configure.ac
54@@ -4779,15 +4779,15 @@ if test x$gcc_cv_libc_provides_ssp = xyes; then
55 fi
56
57 # Test for <sys/sdt.h> on the target.
58-GCC_TARGET_TEMPLATE([HAVE_SYS_SDT_H])
59-AC_MSG_CHECKING(sys/sdt.h in the target C library)
60-have_sys_sdt_h=no
61-if test -f $target_header_dir/sys/sdt.h; then
62- have_sys_sdt_h=yes
63- AC_DEFINE(HAVE_SYS_SDT_H, 1,
64- [Define if your target C library provides sys/sdt.h])
65-fi
66-AC_MSG_RESULT($have_sys_sdt_h)
67+#GCC_TARGET_TEMPLATE([HAVE_SYS_SDT_H])
68+#AC_MSG_CHECKING(sys/sdt.h in the target C library)
69+#have_sys_sdt_h=no
70+#if test -f $target_header_dir/sys/sdt.h; then
71+# have_sys_sdt_h=yes
72+# AC_DEFINE(HAVE_SYS_SDT_H, 1,
73+# [Define if your target C library provides sys/sdt.h])
74+#fi
75+#AC_MSG_RESULT($have_sys_sdt_h)
76
77 # Check if TFmode long double should be used by default or not.
78 # Some glibc targets used DFmode long double, but with glibc 2.4
79diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
80index 4953c9f..53a1145 100755
81--- a/libstdc++-v3/configure
82+++ b/libstdc++-v3/configure
83@@ -20578,11 +20578,11 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
84 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
85 ac_compiler_gnu=$ac_cv_c_compiler_gnu
86
87- if test $glibcxx_cv_sys_sdt_h = yes; then
88+# if test $glibcxx_cv_sys_sdt_h = yes; then
89
90-$as_echo "#define HAVE_SYS_SDT_H 1" >>confdefs.h
91+#$as_echo "#define HAVE_SYS_SDT_H 1" >>confdefs.h
92
93- fi
94+# fi
95 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_sys_sdt_h" >&5
96 $as_echo "$glibcxx_cv_sys_sdt_h" >&6; }
97
98diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac
99index 73d430a..f2135e2 100644
100--- a/libstdc++-v3/configure.ac
101+++ b/libstdc++-v3/configure.ac
102@@ -211,7 +211,7 @@ GLIBCXX_CHECK_SC_NPROCESSORS_ONLN
103 GLIBCXX_CHECK_SC_NPROC_ONLN
104 GLIBCXX_CHECK_PTHREADS_NUM_PROCESSORS_NP
105 GLIBCXX_CHECK_SYSCTL_HW_NCPU
106-GLIBCXX_CHECK_SDT_H
107+#GLIBCXX_CHECK_SDT_H
108
109 # Check for available headers.
110 AC_CHECK_HEADERS([endian.h execinfo.h float.h fp.h ieeefp.h inttypes.h \
43-- 111--
441.7.10.4 1121.8.3.1
45 113