From: Etienne Cordonnier <[email protected]> - add patch upstream status - use git patch format
Signed-off-by: Etienne Cordonnier <[email protected]> --- ...atch => 0001-fix-wrong-libtool-path.patch} | 22 ++++++++-- recipes-core/zlib/zlib_1.2.%.bbappend | 2 +- ...1142-Do-not-use-nm-B-for-Darwin-s-nm.patch | 3 ++ .../clang/0037-Fixes_for_Darwin_SDKs.patch | 8 ++-- ...clude-flexdevh-at-top-block-of-scanl.patch | 3 ++ .../gcc/files/0099-nativesdk-gcc-darwin.patch | 1 + ...0-change-macosx-version-min-to-10.15.patch | 2 + ...patch => 0001-fix-compilation-error.patch} | 42 +++++++++++++------ recipes-devtools/xar/xar_git.bb | 2 +- 9 files changed, 63 insertions(+), 22 deletions(-) rename recipes-core/zlib/files/{zlib-darwin.patch => 0001-fix-wrong-libtool-path.patch} (54%) rename recipes-devtools/xar/xar/{xar.patch => 0001-fix-compilation-error.patch} (85%) diff --git a/recipes-core/zlib/files/zlib-darwin.patch b/recipes-core/zlib/files/0001-fix-wrong-libtool-path.patch similarity index 54% rename from recipes-core/zlib/files/zlib-darwin.patch rename to recipes-core/zlib/files/0001-fix-wrong-libtool-path.patch index cf61194..528b46b 100644 --- a/recipes-core/zlib/files/zlib-darwin.patch +++ b/recipes-core/zlib/files/0001-fix-wrong-libtool-path.patch @@ -1,6 +1,19 @@ ---- zlib-1.2.11-orig/configure 2016-12-31 18:06:40.000000000 +0000 -+++ zlib-1.2.11/configure 2018-09-30 22:01:03.887112033 +0000 -@@ -240,13 +240,7 @@ +From 3b7dfa06c12eb605ae244bbdf37a5c502f63a035 Mon Sep 17 00:00:00 2001 +From: Dominik Schnitzer <[email protected]> +Date: Fri, 12 May 2023 10:11:56 +0000 +Subject: [PATCH] fix wrong libtool path + +Upstream-Status: Inappropriate [OE specific] +Signed-off-by: Dominik Schnitzer <[email protected]> +--- + configure | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +diff --git a/configure b/configure +index 69dfa3f..dcd0e75 100755 +--- a/configure ++++ b/configure +@@ -240,13 +240,7 @@ if test "$gcc" -eq 1 && ($cc -c $test.c) >> configure.log 2>&1; then SHAREDLIB=libz$shared_ext SHAREDLIBV=libz.$VER$shared_ext SHAREDLIBM=libz.$VER1$shared_ext @@ -15,3 +28,6 @@ *) LDSHARED=${LDSHARED-"$cc -shared"} ;; esac else +-- +2.36.1.vfs.0.0 + diff --git a/recipes-core/zlib/zlib_1.2.%.bbappend b/recipes-core/zlib/zlib_1.2.%.bbappend index d662a29..69d1e8a 100644 --- a/recipes-core/zlib/zlib_1.2.%.bbappend +++ b/recipes-core/zlib/zlib_1.2.%.bbappend @@ -1,7 +1,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI += "\ - file://zlib-darwin.patch \ + file://0001-fix-wrong-libtool-path.patch \ " do_configure:darwin19 () { uname=darwin ./configure --prefix=${prefix} --shared --libdir=${libdir} diff --git a/recipes-devtools/binutils/binutils/0001-OS-1142-Do-not-use-nm-B-for-Darwin-s-nm.patch b/recipes-devtools/binutils/binutils/0001-OS-1142-Do-not-use-nm-B-for-Darwin-s-nm.patch index 30364c6..eaf5ba1 100644 --- a/recipes-devtools/binutils/binutils/0001-OS-1142-Do-not-use-nm-B-for-Darwin-s-nm.patch +++ b/recipes-devtools/binutils/binutils/0001-OS-1142-Do-not-use-nm-B-for-Darwin-s-nm.patch @@ -12,6 +12,9 @@ becomes empty because "nm -B" fails. The emptyness of "global_symbol_pipe" causes some libtool link script to be executed with two pipes and to fail due to syntax error: "| |" + +Upstream-Status: Pending [would require proper fix instead of this workaround] +Signed-off-by: Etienne Cordonnier <[email protected]> --- libbacktrace/configure | 2 +- libctf/configure | 2 +- diff --git a/recipes-devtools/clang/clang/0037-Fixes_for_Darwin_SDKs.patch b/recipes-devtools/clang/clang/0037-Fixes_for_Darwin_SDKs.patch index 0a0a438..c44ec57 100644 --- a/recipes-devtools/clang/clang/0037-Fixes_for_Darwin_SDKs.patch +++ b/recipes-devtools/clang/clang/0037-Fixes_for_Darwin_SDKs.patch @@ -1,10 +1,10 @@ From cb9b87097803b4444ec9aa52b5054ba88e4da01e Mon Sep 17 00:00:00 2001 -From: OpenEmbedded <oe.patch@oe> +From: Dominik Schnitzer <[email protected]> Date: Wed, 27 Apr 2022 11:22:17 +0000 -Subject: [PATCH] %% original patch: 0001-Fixes_for_Darwin_SDKs.patch - -From: OpenEmbedded <oe.patch@oe> +Subject: [PATCH] Fixes for Darwin SDKs +Upstream-Status: Inappropriate [OE specific] +Signed-off-by: Dominik Schnitzer <[email protected]> --- clang/lib/Driver/ToolChains/Darwin.cpp | 17 ++++++++++++----- llvm/cmake/modules/AddLLVM.cmake | 1 - diff --git a/recipes-devtools/flex/files/0001-scanner-include-flexdevh-at-top-block-of-scanl.patch b/recipes-devtools/flex/files/0001-scanner-include-flexdevh-at-top-block-of-scanl.patch index 206adae..e86e771 100644 --- a/recipes-devtools/flex/files/0001-scanner-include-flexdevh-at-top-block-of-scanl.patch +++ b/recipes-devtools/flex/files/0001-scanner-include-flexdevh-at-top-block-of-scanl.patch @@ -20,6 +20,9 @@ code in scan.l (gcc warning: return makes pointer from integer without a cast [-Wint-conversion]). Fixes #247. + +Upstream-Status: Backport [https://github.com/westes/flex/commit/4b5111d9772b5c160340ca96f08d30d7f6db5cda] +Signed-off-by: Dominik Schnitzer <[email protected]> --- src/scan.l | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/recipes-devtools/gcc/files/0099-nativesdk-gcc-darwin.patch b/recipes-devtools/gcc/files/0099-nativesdk-gcc-darwin.patch index dc703e9..77419c0 100644 --- a/recipes-devtools/gcc/files/0099-nativesdk-gcc-darwin.patch +++ b/recipes-devtools/gcc/files/0099-nativesdk-gcc-darwin.patch @@ -4,6 +4,7 @@ Date: Wed, 3 Aug 2022 13:37:20 +0200 Subject: [PATCH] rebase patch "0099-nativesdk-gcc-darwin.patch" from meta-darwin +Upstream-Status: Inappropriate [OE specific] Signed-off-by: Etienne Cordonnier <[email protected]> --- gcc/config/darwin-c.c | 4 ++-- diff --git a/recipes-devtools/gcc/files/0100-change-macosx-version-min-to-10.15.patch b/recipes-devtools/gcc/files/0100-change-macosx-version-min-to-10.15.patch index 28de689..2cbe9be 100644 --- a/recipes-devtools/gcc/files/0100-change-macosx-version-min-to-10.15.patch +++ b/recipes-devtools/gcc/files/0100-change-macosx-version-min-to-10.15.patch @@ -3,6 +3,8 @@ From: Etienne Cordonnier <[email protected]> Date: Thu, 11 Aug 2022 15:39:44 +0200 Subject: [PATCH] change macosx-version-min to 10.15 +Upstream-Status: Inappropriate [OE specific] +Signed-off-by: Etienne Cordonnier <[email protected]> --- libgcc/config/t-darwin | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes-devtools/xar/xar/xar.patch b/recipes-devtools/xar/xar/0001-fix-compilation-error.patch similarity index 85% rename from recipes-devtools/xar/xar/xar.patch rename to recipes-devtools/xar/xar/0001-fix-compilation-error.patch index fd17e53..950c87f 100644 --- a/recipes-devtools/xar/xar/xar.patch +++ b/recipes-devtools/xar/xar/0001-fix-compilation-error.patch @@ -1,3 +1,29 @@ +From 17605e2eaa97227ddee3ceac48af560ac3b7a7ad Mon Sep 17 00:00:00 2001 +From: OpenEmbedded <oe.patch@oe> +Date: Fri, 12 May 2023 13:05:08 +0000 +Subject: [PATCH] fix compilation error + +Upstream-Status: Inappropriate [OE specific] +Signed-off-by: Dominik Schnitzer <[email protected]> +--- + xar/Makefile.in | 2 +- + xar/configure | 6 +++--- + xar/configure.ac | 6 +++--- + 3 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/xar/Makefile.in b/xar/Makefile.in +index a6d6814..63d9445 100644 +--- a/xar/Makefile.in ++++ b/xar/Makefile.in +@@ -76,7 +76,7 @@ include $(dir_names:%=%/Makefile.inc) + # + ifeq (@enable_autogen@, 1) + @srcroot@configure : @[email protected] +- cd ./@srcroot@ && $(AUTOCONF) ++ cd @srcroot@ && $(AUTOCONF) + + @[email protected] : @srcroot@configure + ./@[email protected] --recheck diff --git a/xar/configure b/xar/configure index cb44f98..97a9065 100755 --- a/xar/configure @@ -46,16 +72,6 @@ index d1e6362..a77fccc 100644 else AC_MSG_RESULT([no]) have_libxml2="0" -diff --git a/xar/Makefile.in b/xar/Makefile.in -index a6d6814..a6c37b8 100644 ---- a/xar/Makefile.in -+++ b/xar/Makefile.in -@@ -76,7 +76,7 @@ include $(dir_names:%=%/Makefile.inc) - # - ifeq (@enable_autogen@, 1) - @srcroot@configure : @[email protected] -- cd ./@srcroot@ && $(AUTOCONF) -+ cd @srcroot@ && $(AUTOCONF) - - @[email protected] : @srcroot@configure - ./@[email protected] --recheck +-- +2.36.1.vfs.0.0 + diff --git a/recipes-devtools/xar/xar_git.bb b/recipes-devtools/xar/xar_git.bb index d8e7bdd..575ac36 100644 --- a/recipes-devtools/xar/xar_git.bb +++ b/recipes-devtools/xar/xar_git.bb @@ -6,7 +6,7 @@ SECTION = "devel" SRCREV = "2b9a4ab7003f1db8c54da4fea55fcbb424fdecb0" SRC_URI = " \ git://github.com/tpoechtrager/xar.git;branch=master;protocol=https \ - file://xar.patch \ + file://0001-fix-compilation-error.patch \ " inherit autotools pkgconfig -- 2.36.1.vfs.0.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#60037): https://lists.yoctoproject.org/g/yocto/message/60037 Mute This Topic: https://lists.yoctoproject.org/mt/98943223/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
