summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-07-17 17:38:57 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-24 11:52:26 +0100
commitb865fb4fcb1c3ed1d8a80e5f5febbace0ead32d1 (patch)
tree0df6e1d99301f7eacee55ce0ab2fb78f91b5c261
parente3af86e98d62d09507011618ce254b12f5466750 (diff)
downloadpoky-b865fb4fcb1c3ed1d8a80e5f5febbace0ead32d1.tar.gz
tcf-agent: upgrade to 1.7.0
Remove 0001-canonicalize_file_name-is-specific-to-glibc.patch as upstream has integrated musl support. (From OE-Core rev: 4c243b71a0a05acc3b2a8bd327a8c97dcc08d3c5) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/tcf-agent/tcf-agent/0001-canonicalize_file_name-is-specific-to-glibc.patch46
-rw-r--r--meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch23
-rw-r--r--meta/recipes-devtools/tcf-agent/tcf-agent_git.bb7
3 files changed, 15 insertions, 61 deletions
diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent/0001-canonicalize_file_name-is-specific-to-glibc.patch b/meta/recipes-devtools/tcf-agent/tcf-agent/0001-canonicalize_file_name-is-specific-to-glibc.patch
deleted file mode 100644
index 5f93c46f29..0000000000
--- a/meta/recipes-devtools/tcf-agent/tcf-agent/0001-canonicalize_file_name-is-specific-to-glibc.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1From 23a3759b74d081b3b2849b0d37a0e5219f37813e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 7 Jan 2016 22:37:48 +0000
4Subject: [PATCH] canonicalize_file_name is specific to glibc
5
6When on Linux and not using glibc then we need to define
7canonicalize_file_name() API, therefore add a check for finding out if
8its not glibc
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12Upstream-Status: Pending
13
14 agent/tcf/framework/mdep.c | 2 +-
15 agent/tcf/framework/mdep.h | 2 +-
16 2 files changed, 2 insertions(+), 2 deletions(-)
17
18diff --git a/agent/tcf/framework/mdep.c b/agent/tcf/framework/mdep.c
19index 2b52ca8..7d09655 100644
20--- a/agent/tcf/framework/mdep.c
21+++ b/agent/tcf/framework/mdep.c
22@@ -1042,7 +1042,7 @@ char * canonicalize_file_name(const char * path) {
23 return strdup(res);
24 }
25
26-#elif defined(__UCLIBC__)
27+#elif defined(__UCLIBC__) || !defined(__GLIBC__)
28
29 char * canonicalize_file_name(const char * path) {
30 return realpath(path, NULL);
31diff --git a/agent/tcf/framework/mdep.h b/agent/tcf/framework/mdep.h
32index 1e718a2..187c399 100644
33--- a/agent/tcf/framework/mdep.h
34+++ b/agent/tcf/framework/mdep.h
35@@ -276,7 +276,7 @@ extern int loc_clock_gettime(int, struct timespec *);
36
37 #define O_BINARY 0
38
39-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
40+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) || !defined(__GLIBC__)
41 # define O_LARGEFILE 0
42 extern char ** environ;
43 extern char * canonicalize_file_name(const char * path);
44--
452.7.0
46
diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch b/meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch
index b66f41ad28..abd33babeb 100644
--- a/meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch
+++ b/meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch
@@ -1,16 +1,17 @@
1Upstream-Status: Inappropriate [poky-specific fix] 1Actually pass the arguments to RANLIB.
2
3Upstream-Status: Pending
4Signed-off-by: Ross Burton <ross.burton@intel.com>
2 5
3Index: agent/Makefile.inc 6Index: agent/Makefile.inc
4=================================================================== 7===================================================================
5--- agent.orig/Makefile.inc 8--- a/Makefile.inc
6+++ agent/Makefile.inc 9+++ b/Makefile.inc
7@@ -88,6 +88,9 @@ ifneq ($(OPSYS),Windows) 10@@ -92,6 +92,7 @@ ifeq ($(OPSYS),GNU/Linux)
8 ifneq ($(CC),g++) 11 OPTS += -DUSE_uuid_generate=0
9 OPTS += -Wmissing-prototypes
10 endif 12 endif
11+ ifneq ($(RANLIB),) 13 OPTS += -DENABLE_arch_$(shell uname -m)
12+ RANLIB += $@ 14+ RANLIB += $@
13+ endif
14 endif 15 endif
15 16
16 # Compiler flags definition 17 ifneq ($(OPSYS),Windows)
diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
index ba14c42698..20cb9a844d 100644
--- a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
+++ b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
@@ -5,14 +5,13 @@ BUGTRACKER = "https://bugs.eclipse.org/bugs/"
5LICENSE = "EPL-1.0 | EDL-1.0" 5LICENSE = "EPL-1.0 | EDL-1.0"
6LIC_FILES_CHKSUM = "file://edl-v10.html;md5=522a390a83dc186513f0500543ad3679" 6LIC_FILES_CHKSUM = "file://edl-v10.html;md5=522a390a83dc186513f0500543ad3679"
7 7
8SRCREV = "2dddd5f440a15d5406032fac20f206484513646f" 8SRCREV = "a022ef2f1acfd9209a1bf792dda14ae4b0d1b60f"
9PV = "1.4.0+git${SRCPV}" 9PV = "1.7.0+git${SRCPV}"
10 10
11UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" 11UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
12SRC_URI = "git://git.eclipse.org/gitroot/tcf/org.eclipse.tcf.agent;branch=1.4_neon_bugfix \ 12SRC_URI = "git://git.eclipse.org/gitroot/tcf/org.eclipse.tcf.agent \
13 file://fix_ranlib.patch \ 13 file://fix_ranlib.patch \
14 file://ldflags.patch \ 14 file://ldflags.patch \
15 file://0001-canonicalize_file_name-is-specific-to-glibc.patch;striplevel=2 \
16 file://tcf-agent.init \ 15 file://tcf-agent.init \
17 file://tcf-agent.service \ 16 file://tcf-agent.service \
18 " 17 "