On 10/26/21 13:11, Richard Purdie wrote:
The SYSTEMLIBS_DIR change was spread over three patches, merge these together since there is no value in having them separate.Signed-off-by: Richard Purdie <richard.pur...@linuxfoundation.org> --- meta/recipes-devtools/gcc/gcc-11.2.inc | 2 - ...AMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch | 52 ++++++++++--------- ...IR-replacement-instead-of-hardcoding.patch | 26 ---------- ...22-aarch64-Add-support-for-musl-ldso.patch | 25 --------- 4 files changed, 28 insertions(+), 77 deletions(-) delete mode 100644 meta/recipes-devtools/gcc/gcc/0021-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch delete mode 100644 meta/recipes-devtools/gcc/gcc/0022-aarch64-Add-support-for-musl-ldso.patch diff --git a/meta/recipes-devtools/gcc/gcc-11.2.inc b/meta/recipes-devtools/gcc/gcc-11.2.inc index 9fd30f52a88..6fa344e9612 100644 --- a/meta/recipes-devtools/gcc/gcc-11.2.inc +++ b/meta/recipes-devtools/gcc/gcc-11.2.inc @@ -50,8 +50,6 @@ SRC_URI = "\ file://0018-export-CPP.patch \ file://0019-Ensure-target-gcc-headers-can-be-included.patch \ file://0020-Don-t-search-host-directory-during-relink-if-inst_pr.patch \ - file://0021-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch \ - file://0022-aarch64-Add-support-for-musl-ldso.patch \ file://0023-libcc1-fix-libcc1-s-install-path-and-rpath.patch \ file://0024-handle-sysroot-support-for-nativesdk-gcc.patch \ file://0025-Search-target-sysroot-gcc-version-specific-dirs-with.patch \ diff --git a/meta/recipes-devtools/gcc/gcc/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch b/meta/recipes-devtools/gcc/gcc/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch index 4726267a80f..0884730786c 100644 --- a/meta/recipes-devtools/gcc/gcc/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch +++ b/meta/recipes-devtools/gcc/gcc/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch @@ -30,8 +30,7 @@ Upstream-Status: Inappropriate [OE configuration] gcc/config/sparc/linux64.h | 4 ++-- 12 files changed, 29 insertions(+), 34 deletions(-)-diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h-index c1dae8ca2cf..3ce2b76c1a4 100644 +unchanged: --- a/gcc/config/alpha/linux-elf.h +++ b/gcc/config/alpha/linux-elf.h @@ -23,8 +23,8 @@ along with GCC; see the file COPYING3. If not see @@ -45,8 +44,7 @@ index c1dae8ca2cf..3ce2b76c1a4 100644 #if DEFAULT_LIBC == LIBC_UCLIBC #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" #elif DEFAULT_LIBC == LIBC_GLIBC -diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h -index 85d0136e76e..6bd95855827 100644 +unchanged:
Doesn't the above change how the patch is applied ?
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#157474): https://lists.openembedded.org/g/openembedded-core/message/157474 Mute This Topic: https://lists.openembedded.org/mt/86599747/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
