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-fix-build-with-musl-libc.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-fix-build-with-musl-libc.patch')
-rw-r--r-- | meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch b/meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch index 78621c7fe0..0a72ff27c8 100644 --- a/meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch +++ b/meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch @@ -1,4 +1,4 @@ -From 157914941bd38f1a38bb6bd7294ca6c2bc1b8dcb Mon Sep 17 00:00:00 2001 +From 034e7da08c3fbffcba8cf8d4e24a71a16558db5a Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 16 Jul 2017 15:51:28 -0700 Subject: [PATCH] fix build with musl libc @@ -6,6 +6,7 @@ Subject: [PATCH] fix build with musl libc Patch from https://github.com/gperftools/gperftools/pull/765/ Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- configure.ac | 1 + src/malloc_hook_mmap_linux.h | 8 ++++++-- @@ -56,6 +57,3 @@ index 79ac4e3..d444635 100755 // libc's version: extern "C" void* __sbrk(ptrdiff_t increment); --- -2.13.3 - |