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/0001-disbale-heap-checkers-and-debug-allocator-on-musl.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/0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch')
-rw-r--r-- | meta-oe/recipes-support/gperftools/gperftools/0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/meta-oe/recipes-support/gperftools/gperftools/0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch b/meta-oe/recipes-support/gperftools/gperftools/0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch index 99127e11a..ab3ceb964 100644 --- a/meta-oe/recipes-support/gperftools/gperftools/0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch +++ b/meta-oe/recipes-support/gperftools/gperftools/0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch | |||
@@ -1,19 +1,20 @@ | |||
1 | From b5961f17e9d7f2bc44da611b3e4b27c8a641fc72 Mon Sep 17 00:00:00 2001 | 1 | From 06605158852f9364519391fa11070ba5ec4303e9 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sat, 2 Sep 2017 08:07:17 -0700 | 3 | Date: Sat, 2 Sep 2017 08:07:17 -0700 |
4 | Subject: [PATCH] disbale heap checkers and debug allocator on musl | 4 | Subject: [PATCH] disbale heap checkers and debug allocator on musl |
5 | 5 | ||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
7 | --- | 7 | |
8 | Upstream-Status: Pending | 8 | Upstream-Status: Pending |
9 | 9 | ||
10 | --- | ||
10 | configure.ac | 2 ++ | 11 | configure.ac | 2 ++ |
11 | 1 file changed, 2 insertions(+) | 12 | 1 file changed, 2 insertions(+) |
12 | 13 | ||
13 | Index: git/configure.ac | 14 | diff --git a/configure.ac b/configure.ac |
14 | =================================================================== | 15 | index 70b49a3..8154c5c 100644 |
15 | --- git.orig/configure.ac | 16 | --- a/configure.ac |
16 | +++ git/configure.ac | 17 | +++ b/configure.ac |
17 | @@ -51,6 +51,8 @@ case "$host" in | 18 | @@ -51,6 +51,8 @@ case "$host" in |
18 | *-cygwin*) default_enable_heap_checker=no; default_enable_cpu_profiler=no;; | 19 | *-cygwin*) default_enable_heap_checker=no; default_enable_cpu_profiler=no;; |
19 | *-freebsd*) default_enable_heap_checker=no;; | 20 | *-freebsd*) default_enable_heap_checker=no;; |