diff options
| author |   Armin Kuster <akuster808@gmail.com> | 2018-04-07 13:42:18 -0700 |
|---|---|---|
| committer | Armin Kuster <akuster808@gmail.com> | 2018-04-13 12:43:38 -0700 |
| commit | 843dbb093d8691d459876ebf35be0a6cb183606c (patch) | |
| tree | 262c4d70955533be87b35be274db4d6ed4ad1e91 /meta-oe/recipes-devtools | |
| parent | 1fd6c706a47a815583bc1e14e4e7a669aa2a235c (diff) | |
| download | meta-openembedded-contrib-843dbb093d8691d459876ebf35be0a6cb183606c.tar.gz | |
concurrencykit: patch refresh
WARNING:
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:
patching file configure
Hunk #1 succeeded at 535 with fuzz 1 (offset 96 lines).
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools')
| -rw-r--r-- | meta-oe/recipes-devtools/concurrencykit/concurrencykit/cross.patch | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/meta-oe/recipes-devtools/concurrencykit/concurrencykit/cross.patch b/meta-oe/recipes-devtools/concurrencykit/concurrencykit/cross.patch index d3bfab7bbe..9e5058f2ca 100644 --- a/meta-oe/recipes-devtools/concurrencykit/concurrencykit/cross.patch +++ b/meta-oe/recipes-devtools/concurrencykit/concurrencykit/cross.patch @@ -1,8 +1,16 @@ -Index: git/configure -=================================================================== ---- git.orig/configure 2012-11-19 21:07:51.917429465 -0800 -+++ git/configure 2012-11-19 21:13:19.337437278 -0800 -@@ -439,14 +442,18 @@ +From ab0eec78382bd00ce533aec2c84fd50c1733033d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 5 Jan 2013 19:42:51 -0800 + +--- + configure | 32 ++++++++++++++++++-------------- + 1 file changed, 18 insertions(+), 14 deletions(-) + +diff --git a/configure b/configure +index 76c2812..78ce2ff 100755 +--- a/configure ++++ b/configure +@@ -535,14 +535,18 @@ else GZIP_SUFFIX=".gz" fi @@ -25,12 +33,16 @@ Index: git/configure + cat << EOF > .1.c #include <stdio.h> int main(void) { - #if defined(__GNUC__) && (__GNUC__ >= 4) -@@ -569,16 +576,16 @@ + #if defined(_WIN32) +@@ -569,16 +573,16 @@ int main(void) { #endif } EOF -- ++ $CC -o .1 .1.c ++ COMPILER=`./.1` ++ r=$? ++ rm -f .1.c .1 + -$CC -o .1 .1.c -COMPILER=`./.1` -r=$? @@ -40,11 +52,6 @@ Index: git/configure - assert "" "update compiler" -else - echo "success [$CC]" -+ $CC -o .1 .1.c -+ COMPILER=`./.1` -+ r=$? -+ rm -f .1.c .1 -+ + if test "$r" -ne 0; then + assert "" "update compiler" + else |