Signed-off-by: Alexander Kanavin <[email protected]> --- .../libunwind/musl-header-conflict.patch | 27 ++++++++++++------- ...{libunwind_1.3.1.bb => libunwind_1.4.0.bb} | 4 +-- 2 files changed, 19 insertions(+), 12 deletions(-) rename meta/recipes-support/libunwind/{libunwind_1.3.1.bb => libunwind_1.4.0.bb} (87%)
diff --git a/meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch b/meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch index 79f63fd84e..63b78a8a30 100644 --- a/meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch +++ b/meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch @@ -1,4 +1,7 @@ -If you: +From 49b21f0fe5fb93b30b94cc449429fd33de0652a7 Mon Sep 17 00:00:00 2001 +From: Richard Purdie <[email protected]> +Date: Thu, 18 Aug 2016 14:46:32 +0100 +Subject: [PATCH] If you: TCLIBC=musl bitbake unwind TCLIBC=musl bitbake gcc-runtime -c cleansstate @@ -6,12 +9,12 @@ TCLIBC=musl bitbake gcc-runtime you will see libstdc++ fail to build due to finding libunwind's header file. -Khem: "When we build any of gcc components they expect to use internal version -and that works with glibc based gcc since the search headers first look into gcc -headers, however with musl the gcc headers are searched after the standard +Khem: "When we build any of gcc components they expect to use internal version +and that works with glibc based gcc since the search headers first look into gcc +headers, however with musl the gcc headers are searched after the standard headers ( which is by design the right thing )." -This patch hacks around the issue by looking for a define used during gcc-runtime's +This patch hacks around the issue by looking for a define used during gcc-runtime's build and skipping to the internal header in that case. [YOCTO #10129] @@ -20,11 +23,15 @@ RP 2016/8/18 Upstream-Status: Inappropriate [really need to fix gcc] -Index: git/include/unwind.h -=================================================================== ---- git.orig/include/unwind.h -+++ git/include/unwind.h -@@ -23,6 +23,10 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER L +--- + include/unwind.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/include/unwind.h b/include/unwind.h +index 7cf128d..31c2871 100644 +--- a/include/unwind.h ++++ b/include/unwind.h +@@ -23,6 +23,10 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ diff --git a/meta/recipes-support/libunwind/libunwind_1.3.1.bb b/meta/recipes-support/libunwind/libunwind_1.4.0.bb similarity index 87% rename from meta/recipes-support/libunwind/libunwind_1.3.1.bb rename to meta/recipes-support/libunwind/libunwind_1.4.0.bb index 037e04c3c0..f50205f1b9 100644 --- a/meta/recipes-support/libunwind/libunwind_1.3.1.bb +++ b/meta/recipes-support/libunwind/libunwind_1.4.0.bb @@ -10,8 +10,8 @@ SRC_URI = "http://download.savannah.nongnu.org/releases/libunwind/libunwind-${PV " SRC_URI_append_libc-musl = " file://musl-header-conflict.patch" -SRC_URI[md5sum] = "a04f69d66d8e16f8bf3ab72a69112cd6" -SRC_URI[sha256sum] = "43997a3939b6ccdf2f669b50fdb8a4d3205374728c2923ddc2354c65260214f8" +SRC_URI[md5sum] = "5114504c74ac3992ac06aa551cd55678" +SRC_URI[sha256sum] = "df59c931bd4d7ebfd83ee481c943edf015138089b8e50abed8d9c57ba9338435" EXTRA_OECONF_append_libc-musl = " --disable-documentation --disable-tests --enable-static" -- 2.26.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138978): https://lists.openembedded.org/g/openembedded-core/message/138978 Mute This Topic: https://lists.openembedded.org/mt/74584206/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
