summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-devtools
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2018-04-07 13:42:18 -0700
committerArmin Kuster <akuster808@gmail.com>2018-04-13 12:43:38 -0700
commit843dbb093d8691d459876ebf35be0a6cb183606c (patch)
tree262c4d70955533be87b35be274db4d6ed4ad1e91 /meta-oe/recipes-devtools
parent1fd6c706a47a815583bc1e14e4e7a669aa2a235c (diff)
downloadmeta-openembedded-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.patch33
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 d3bfab7bb..9e5058f2c 100644
--- a/meta-oe/recipes-devtools/concurrencykit/concurrencykit/cross.patch
+++ b/meta-oe/recipes-devtools/concurrencykit/concurrencykit/cross.patch
@@ -1,8 +1,16 @@
1Index: git/configure 1From ab0eec78382bd00ce533aec2c84fd50c1733033d Mon Sep 17 00:00:00 2001
2=================================================================== 2From: Khem Raj <raj.khem@gmail.com>
3--- git.orig/configure 2012-11-19 21:07:51.917429465 -0800 3Date: Sat, 5 Jan 2013 19:42:51 -0800
4+++ git/configure 2012-11-19 21:13:19.337437278 -0800 4
5@@ -439,14 +442,18 @@ 5---
6 configure | 32 ++++++++++++++++++--------------
7 1 file changed, 18 insertions(+), 14 deletions(-)
8
9diff --git a/configure b/configure
10index 76c2812..78ce2ff 100755
11--- a/configure
12+++ b/configure
13@@ -535,14 +535,18 @@ else
6 GZIP_SUFFIX=".gz" 14 GZIP_SUFFIX=".gz"
7 fi 15 fi
8 16
@@ -25,12 +33,16 @@ Index: git/configure
25+ cat << EOF > .1.c 33+ cat << EOF > .1.c
26 #include <stdio.h> 34 #include <stdio.h>
27 int main(void) { 35 int main(void) {
28 #if defined(__GNUC__) && (__GNUC__ >= 4) 36 #if defined(_WIN32)
29@@ -569,16 +576,16 @@ 37@@ -569,16 +573,16 @@ int main(void) {
30 #endif 38 #endif
31 } 39 }
32 EOF 40 EOF
33- 41+ $CC -o .1 .1.c
42+ COMPILER=`./.1`
43+ r=$?
44+ rm -f .1.c .1
45
34-$CC -o .1 .1.c 46-$CC -o .1 .1.c
35-COMPILER=`./.1` 47-COMPILER=`./.1`
36-r=$? 48-r=$?
@@ -40,11 +52,6 @@ Index: git/configure
40- assert "" "update compiler" 52- assert "" "update compiler"
41-else 53-else
42- echo "success [$CC]" 54- echo "success [$CC]"
43+ $CC -o .1 .1.c
44+ COMPILER=`./.1`
45+ r=$?
46+ rm -f .1.c .1
47+
48+ if test "$r" -ne 0; then 55+ if test "$r" -ne 0; then
49+ assert "" "update compiler" 56+ assert "" "update compiler"
50+ else 57+ else