diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2018-03-16 20:12:33 +0000 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-03-16 19:57:03 -0700 |
commit | 41038a71396d1edd58558a5b110cafdc7b1b1762 (patch) | |
tree | 9e23d7d5858b39c1bd6a115bf7ace2a799422987 /meta-oe/recipes-support/gperftools/gperftools/sgidef.patch | |
parent | 61914441e8b69e99907a05e190a8d90641b99190 (diff) | |
download | meta-openembedded-41038a71396d1edd58558a5b110cafdc7b1b1762.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/sgidef.patch')
-rw-r--r-- | meta-oe/recipes-support/gperftools/gperftools/sgidef.patch | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/meta-oe/recipes-support/gperftools/gperftools/sgidef.patch b/meta-oe/recipes-support/gperftools/gperftools/sgidef.patch index 7e1a23bf6..10274a6de 100644 --- a/meta-oe/recipes-support/gperftools/gperftools/sgidef.patch +++ b/meta-oe/recipes-support/gperftools/gperftools/sgidef.patch | |||
@@ -1,11 +1,19 @@ | |||
1 | sgidef.h does not exist on musl and its not needed to compile | 1 | From 259b420444c52463795b4b582a2ab7511149eea7 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 16 Oct 2017 21:26:40 -0700 | ||
4 | Subject: [PATCH] sgidef.h does not exist on musl and its not needed to compile | ||
2 | 5 | ||
3 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
4 | Upstream-Status: Pending | 7 | Upstream-Status: Pending |
5 | Index: git/src/base/linux_syscall_support.h | 8 | |
6 | =================================================================== | 9 | --- |
7 | --- git.orig/src/base/linux_syscall_support.h | 10 | src/base/linux_syscall_support.h | 2 +- |
8 | +++ git/src/base/linux_syscall_support.h | 11 | 1 file changed, 1 insertion(+), 1 deletion(-) |
12 | |||
13 | diff --git a/src/base/linux_syscall_support.h b/src/base/linux_syscall_support.h | ||
14 | index 70431ca..b23ca59 100644 | ||
15 | --- a/src/base/linux_syscall_support.h | ||
16 | +++ b/src/base/linux_syscall_support.h | ||
9 | @@ -164,7 +164,7 @@ extern "C" { | 17 | @@ -164,7 +164,7 @@ extern "C" { |
10 | #include <endian.h> | 18 | #include <endian.h> |
11 | #include <fcntl.h> | 19 | #include <fcntl.h> |