diff options
| author |   Martin Jansa <martin.jansa@gmail.com> | 2018-03-16 20:12:33 +0000 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2018-03-21 18:43:17 -0700 |
| commit | 0f2646ef0122585a26db0da62a7060112654a82a (patch) | |
| tree | 77d96f4ea0a459b250ff9791e37e795b1037e91a /meta-oe/recipes-support/gperftools/gperftools/0001-Use-ucontext_t-instead-of-struct-ucontext.patch | |
| parent | db9170bd319d02b6d905ed3d805cbccd5f1764ff (diff) | |
| download | meta-openembedded-contrib-0f2646ef0122585a26db0da62a7060112654a82a.tar.gz | |
gperftools: refresh the patches
WARNING: gperftools-2.6.1-r0 do_patch:
Some of the context lines in patches were ignored. This can lead to incorrectly applied patches.
The context lines in the patches can be updated with devtool:
devtool modify <recipe>
devtool finish --force-patch-refresh <recipe> <layer_path>
Then the updated patches and the source tree (in devtool's workspace)
should be reviewed to make sure the patches apply in the correct place
and don't introduce duplicate lines (which can, and does happen
when some of the context is ignored). Further information:
http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
Details:
Applying patch 0001-Support-Atomic-ops-on-clang.patch
patching file src/base/atomicops.h
Hunk #1 succeeded at 124 with fuzz 2 (offset 6 lines).
Now at patch 0001-Support-Atomic-ops-on-clang.patch
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/gperftools/gperftools/0001-Use-ucontext_t-instead-of-struct-ucontext.patch')
| -rw-r--r-- | meta-oe/recipes-support/gperftools/gperftools/0001-Use-ucontext_t-instead-of-struct-ucontext.patch | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/meta-oe/recipes-support/gperftools/gperftools/0001-Use-ucontext_t-instead-of-struct-ucontext.patch b/meta-oe/recipes-support/gperftools/gperftools/0001-Use-ucontext_t-instead-of-struct-ucontext.patch index 5bd0b6fa4f..b3033621b5 100644 --- a/meta-oe/recipes-support/gperftools/gperftools/0001-Use-ucontext_t-instead-of-struct-ucontext.patch +++ b/meta-oe/recipes-support/gperftools/gperftools/0001-Use-ucontext_t-instead-of-struct-ucontext.patch @@ -1,4 +1,4 @@ -From 12ac0dc6742e1bcdfaf1842186c9002f0820a5e8 Mon Sep 17 00:00:00 2001 +From 230cd84486145c5bb1d69d4c9a544e00adbcc9b5 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 1 Jul 2017 13:21:21 -0700 Subject: [PATCH] Use ucontext_t instead of struct ucontext @@ -6,12 +6,13 @@ Subject: [PATCH] Use ucontext_t instead of struct ucontext Newer glibc has dropped the ucontext tag from exposing Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- src/stacktrace_powerpc-linux-inl.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/stacktrace_powerpc-linux-inl.h b/src/stacktrace_powerpc-linux-inl.h -index a9bf775..47ff2d7 100644 +index 3b3843b..a301a46 100644 --- a/src/stacktrace_powerpc-linux-inl.h +++ b/src/stacktrace_powerpc-linux-inl.h @@ -53,7 +53,6 @@ @@ -31,6 +32,3 @@ index a9bf775..47ff2d7 100644 // We don't care about the rest, since IP value is at 'uc' field.A } *sigframe = reinterpret_cast<rt_signal_frame_32*>(current); result[n] = (void*) sigframe->uc.uc_mcontext.uc_regs->gregs[PT_NIP]; --- -2.13.2 - |