ok
On Tue, Oct 26, 2021 at 4:11 AM Richard Purdie
<richard.pur...@linuxfoundation.org> wrote:
>
> Since we now have recipe specific sysroots we no longer need this patch
> to avoid the dtrace headers affecting the build of gcc-runtime. Drop
> the patch.
>
> Signed-off-by: Richard Purdie <richard.pur...@linuxfoundation.org>
> ---
> meta/recipes-devtools/gcc/gcc-11.2.inc | 1 -
> .../gcc/gcc/0013-Disable-sdt.patch | 110 ------------------
> 2 files changed, 111 deletions(-)
> delete mode 100644 meta/recipes-devtools/gcc/gcc/0013-Disable-sdt.patch
>
> diff --git a/meta/recipes-devtools/gcc/gcc-11.2.inc
> b/meta/recipes-devtools/gcc/gcc-11.2.inc
> index 6fa344e9612..1ab779533ca 100644
> --- a/meta/recipes-devtools/gcc/gcc-11.2.inc
> +++ b/meta/recipes-devtools/gcc/gcc-11.2.inc
> @@ -42,7 +42,6 @@ SRC_URI = "\
> file://0010-MIPS64-Default-to-N64-ABI.patch \
>
> file://0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch \
> file://0012-gcc-Fix-argument-list-too-long-error.patch \
> - file://0013-Disable-sdt.patch \
> file://0014-libtool.patch \
>
> file://0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch \
>
> file://0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch \
> diff --git a/meta/recipes-devtools/gcc/gcc/0013-Disable-sdt.patch
> b/meta/recipes-devtools/gcc/gcc/0013-Disable-sdt.patch
> deleted file mode 100644
> index 1e657666df9..00000000000
> --- a/meta/recipes-devtools/gcc/gcc/0013-Disable-sdt.patch
> +++ /dev/null
> @@ -1,110 +0,0 @@
> -From 7928a4eddc4a6d821a6aa6eaaea1fd60d54e3da9 Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.k...@gmail.com>
> -Date: Fri, 29 Mar 2013 09:28:10 +0400
> -Subject: [PATCH] Disable sdt.
> -
> -We don't list dtrace in DEPENDS so we shouldn't be depending on this header.
> -It may or may not exist from preivous builds though. To be determinstic,
> disable
> -sdt.h usage always. This avoids build failures if the header is removed
> after configure
> -but before libgcc is compiled for example.
> -
> -RP 2012/8/7
> -
> -Signed-off-by: Khem Raj <raj.k...@gmail.com>
> -
> -Disable sdt for libstdc++-v3.
> -
> -Signed-off-by: Robert Yang <liezhi.y...@windriver.com>
> -
> -Upstream-Status: Inappropriate [hack]
> ----
> - gcc/configure | 12 ++++++------
> - gcc/configure.ac | 18 +++++++++---------
> - libstdc++-v3/configure | 6 +++---
> - libstdc++-v3/configure.ac | 2 +-
> - 4 files changed, 19 insertions(+), 19 deletions(-)
> -
> -diff --git a/gcc/configure b/gcc/configure
> -index c5d3bc4ee2d..5160917d73e 100755
> ---- a/gcc/configure
> -+++ b/gcc/configure
> -@@ -30812,12 +30812,12 @@ fi
> - { $as_echo "$as_me:${as_lineno-$LINENO}: checking sys/sdt.h in the target C
> library" >&5
> - $as_echo_n "checking sys/sdt.h in the target C library... " >&6; }
> - have_sys_sdt_h=no
> --if test -f $target_header_dir/sys/sdt.h; then
> -- have_sys_sdt_h=yes
> --
> --$as_echo "#define HAVE_SYS_SDT_H 1" >>confdefs.h
> --
> --fi
> -+#if test -f $target_header_dir/sys/sdt.h; then
> -+# have_sys_sdt_h=yes
> -+#
> -+#$as_echo "#define HAVE_SYS_SDT_H 1" >>confdefs.h
> -+#
> -+#fi
> - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_sys_sdt_h" >&5
> - $as_echo "$have_sys_sdt_h" >&6; }
> -
> -diff --git a/gcc/configure.ac b/gcc/configure.ac
> -index f83420326d6..50f78308e8a 100644
> ---- a/gcc/configure.ac
> -+++ b/gcc/configure.ac
> -@@ -6653,15 +6653,15 @@ fi
> - AC_SUBST([enable_default_ssp])
> -
> - # Test for <sys/sdt.h> on the target.
> --GCC_TARGET_TEMPLATE([HAVE_SYS_SDT_H])
> --AC_MSG_CHECKING(sys/sdt.h in the target C library)
> --have_sys_sdt_h=no
> --if test -f $target_header_dir/sys/sdt.h; then
> -- have_sys_sdt_h=yes
> -- AC_DEFINE(HAVE_SYS_SDT_H, 1,
> -- [Define if your target C library provides sys/sdt.h])
> --fi
> --AC_MSG_RESULT($have_sys_sdt_h)
> -+#GCC_TARGET_TEMPLATE([HAVE_SYS_SDT_H])
> -+#AC_MSG_CHECKING(sys/sdt.h in the target C library)
> -+#have_sys_sdt_h=no
> -+#if test -f $target_header_dir/sys/sdt.h; then
> -+# have_sys_sdt_h=yes
> -+# AC_DEFINE(HAVE_SYS_SDT_H, 1,
> -+# [Define if your target C library provides sys/sdt.h])
> -+#fi
> -+#AC_MSG_RESULT($have_sys_sdt_h)
> -
> - # Check if TFmode long double should be used by default or not.
> - # Some glibc targets used DFmode long double, but with glibc 2.4
> -diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
> -index a310e9feb6c..c879445b8a6 100755
> ---- a/libstdc++-v3/configure
> -+++ b/libstdc++-v3/configure
> -@@ -22014,11 +22014,11 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS
> conftest.$ac_ext >&5'
> - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS
> conftest.$ac_ext $LIBS >&5'
> - ac_compiler_gnu=$ac_cv_c_compiler_gnu
> -
> -- if test $glibcxx_cv_sys_sdt_h = yes; then
> -+# if test $glibcxx_cv_sys_sdt_h = yes; then
> -
> --$as_echo "#define HAVE_SYS_SDT_H 1" >>confdefs.h
> -+#$as_echo "#define HAVE_SYS_SDT_H 1" >>confdefs.h
> -
> -- fi
> -+# fi
> - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_sys_sdt_h"
> >&5
> - $as_echo "$glibcxx_cv_sys_sdt_h" >&6; }
> -
> -diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac
> -index 3c799be82b1..3f63a8ec9ce 100644
> ---- a/libstdc++-v3/configure.ac
> -+++ b/libstdc++-v3/configure.ac
> -@@ -240,7 +240,7 @@ GLIBCXX_CHECK_SC_NPROCESSORS_ONLN
> - GLIBCXX_CHECK_SC_NPROC_ONLN
> - GLIBCXX_CHECK_PTHREADS_NUM_PROCESSORS_NP
> - GLIBCXX_CHECK_SYSCTL_HW_NCPU
> --GLIBCXX_CHECK_SDT_H
> -+#GLIBCXX_CHECK_SDT_H
> -
> - # Check for available headers.
> - AC_CHECK_HEADERS([endian.h execinfo.h float.h fp.h ieeefp.h inttypes.h \
> --
> 2.32.0
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#157401):
https://lists.openembedded.org/g/openembedded-core/message/157401
Mute This Topic: https://lists.openembedded.org/mt/86599748/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
