From 4c243b71a0a05acc3b2a8bd327a8c97dcc08d3c5 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 17 Jul 2018 17:38:57 +0100 Subject: tcf-agent: upgrade to 1.7.0 Remove 0001-canonicalize_file_name-is-specific-to-glibc.patch as upstream has integrated musl support. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- ...nonicalize_file_name-is-specific-to-glibc.patch | 46 ---------------------- .../tcf-agent/tcf-agent/fix_ranlib.patch | 23 +++++------ meta/recipes-devtools/tcf-agent/tcf-agent_git.bb | 7 ++-- 3 files changed, 15 insertions(+), 61 deletions(-) delete mode 100644 meta/recipes-devtools/tcf-agent/tcf-agent/0001-canonicalize_file_name-is-specific-to-glibc.patch (limited to 'meta/recipes-devtools') 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 @@ -From 23a3759b74d081b3b2849b0d37a0e5219f37813e Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 7 Jan 2016 22:37:48 +0000 -Subject: [PATCH] canonicalize_file_name is specific to glibc - -When on Linux and not using glibc then we need to define -canonicalize_file_name() API, therefore add a check for finding out if -its not glibc - -Signed-off-by: Khem Raj ---- -Upstream-Status: Pending - - agent/tcf/framework/mdep.c | 2 +- - agent/tcf/framework/mdep.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/agent/tcf/framework/mdep.c b/agent/tcf/framework/mdep.c -index 2b52ca8..7d09655 100644 ---- a/agent/tcf/framework/mdep.c -+++ b/agent/tcf/framework/mdep.c -@@ -1042,7 +1042,7 @@ char * canonicalize_file_name(const char * path) { - return strdup(res); - } - --#elif defined(__UCLIBC__) -+#elif defined(__UCLIBC__) || !defined(__GLIBC__) - - char * canonicalize_file_name(const char * path) { - return realpath(path, NULL); -diff --git a/agent/tcf/framework/mdep.h b/agent/tcf/framework/mdep.h -index 1e718a2..187c399 100644 ---- a/agent/tcf/framework/mdep.h -+++ b/agent/tcf/framework/mdep.h -@@ -276,7 +276,7 @@ extern int loc_clock_gettime(int, struct timespec *); - - #define O_BINARY 0 - --#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) -+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) || !defined(__GLIBC__) - # define O_LARGEFILE 0 - extern char ** environ; - extern char * canonicalize_file_name(const char * path); --- -2.7.0 - 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 @@ -Upstream-Status: Inappropriate [poky-specific fix] +Actually pass the arguments to RANLIB. + +Upstream-Status: Pending +Signed-off-by: Ross Burton Index: agent/Makefile.inc =================================================================== ---- agent.orig/Makefile.inc -+++ agent/Makefile.inc -@@ -88,6 +88,9 @@ ifneq ($(OPSYS),Windows) - ifneq ($(CC),g++) - OPTS += -Wmissing-prototypes +--- a/Makefile.inc ++++ b/Makefile.inc +@@ -92,6 +92,7 @@ ifeq ($(OPSYS),GNU/Linux) + OPTS += -DUSE_uuid_generate=0 endif -+ ifneq ($(RANLIB),) -+ RANLIB += $@ -+ endif + OPTS += -DENABLE_arch_$(shell uname -m) ++ RANLIB += $@ endif - - # Compiler flags definition + + 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/" LICENSE = "EPL-1.0 | EDL-1.0" LIC_FILES_CHKSUM = "file://edl-v10.html;md5=522a390a83dc186513f0500543ad3679" -SRCREV = "2dddd5f440a15d5406032fac20f206484513646f" -PV = "1.4.0+git${SRCPV}" +SRCREV = "a022ef2f1acfd9209a1bf792dda14ae4b0d1b60f" +PV = "1.7.0+git${SRCPV}" UPSTREAM_CHECK_GITTAGREGEX = "(?P(\d+(\.\d+)+))" -SRC_URI = "git://git.eclipse.org/gitroot/tcf/org.eclipse.tcf.agent;branch=1.4_neon_bugfix \ +SRC_URI = "git://git.eclipse.org/gitroot/tcf/org.eclipse.tcf.agent \ file://fix_ranlib.patch \ file://ldflags.patch \ - file://0001-canonicalize_file_name-is-specific-to-glibc.patch;striplevel=2 \ file://tcf-agent.init \ file://tcf-agent.service \ " -- cgit 1.2.3-korg