summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Straka <derek@asterius.io>2016-04-22 14:45:59 -0400
committerArmin Kuster <akuster808@gmail.com>2016-05-02 14:03:03 -0700
commit9f1c8eebc8f0901f4fdd3f562a72a81f67dd4f45 (patch)
tree3d939c4bb0b11e6d67d391a6f280a769476ff946
parentfb946ee40b559a4ad65e6fef51edd341d1d35da7 (diff)
downloadmeta-openembedded-9f1c8eebc8f0901f4fdd3f562a72a81f67dd4f45.tar.gz
concurrencykit: update to version 0.5.1
Signed-off-by: Derek Straka <derek@asterius.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-devtools/concurrencykit/concurrencykit/cross.patch16
-rw-r--r--meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb6
2 files changed, 4 insertions, 18 deletions
diff --git a/meta-oe/recipes-devtools/concurrencykit/concurrencykit/cross.patch b/meta-oe/recipes-devtools/concurrencykit/concurrencykit/cross.patch
index 38504fef6..d3bfab7bb 100644
--- a/meta-oe/recipes-devtools/concurrencykit/concurrencykit/cross.patch
+++ b/meta-oe/recipes-devtools/concurrencykit/concurrencykit/cross.patch
@@ -2,20 +2,6 @@ Index: git/configure
2=================================================================== 2===================================================================
3--- git.orig/configure 2012-11-19 21:07:51.917429465 -0800 3--- git.orig/configure 2012-11-19 21:07:51.917429465 -0800
4+++ git/configure 2012-11-19 21:13:19.337437278 -0800 4+++ git/configure 2012-11-19 21:13:19.337437278 -0800
5@@ -275,8 +275,11 @@
6 assert "$SYSTEM" "$SYSTEM" "unsupported"
7
8 CORES=${CORES:-${DCORES}}
9-printf "Detecting machine architecture..."
10-PLATFORM=`uname -m 2> /dev/null`
11+if test -z "$PLATFORM"; then
12+ printf "Detecting machine architecture..."
13+ PLATFORM=`uname -m 2> /dev/null`
14+fi
15+
16 case $PLATFORM in
17 "macppc"|"Power Macintosh"|"powerpc")
18 MM="${MM:-"CK_MD_RMO"}"
19@@ -439,14 +442,18 @@ 5@@ -439,14 +442,18 @@
20 GZIP_SUFFIX=".gz" 6 GZIP_SUFFIX=".gz"
21 fi 7 fi
@@ -40,7 +26,7 @@ Index: git/configure
40 #include <stdio.h> 26 #include <stdio.h>
41 int main(void) { 27 int main(void) {
42 #if defined(__GNUC__) && (__GNUC__ >= 4) 28 #if defined(__GNUC__) && (__GNUC__ >= 4)
43@@ -460,16 +467,16 @@ 29@@ -569,16 +576,16 @@
44 #endif 30 #endif
45 } 31 }
46 EOF 32 EOF
diff --git a/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb b/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb
index b4ac9c9f9..51243c237 100644
--- a/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb
+++ b/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb
@@ -7,9 +7,9 @@ LICENSE = "BSD & Apache-2.0"
7HOMEPAGE = "http://concurrencykit.org" 7HOMEPAGE = "http://concurrencykit.org"
8SECTION = "base" 8SECTION = "base"
9 9
10PV = "0.4.3+git${SRCPV}" 10PV = "0.5.1+git${SRCPV}"
11SRCREV = "900d203aa9e41288545368ea40da0bee89f7907f" 11SRCREV = "f97d3da5c375ac2fc5a9173cdd36cb828915a2e1"
12LIC_FILES_CHKSUM = "file://LICENSE;md5=f12611e65e064515ce264249b2bdea98" 12LIC_FILES_CHKSUM = "file://LICENSE;md5=a0b24c1a8f9ad516a297d055b0294231"
13SRC_URI = "git://github.com/concurrencykit/ck.git;protocol=https \ 13SRC_URI = "git://github.com/concurrencykit/ck.git;protocol=https \
14 file://cross.patch \ 14 file://cross.patch \
15" 15"