diff options
Diffstat (limited to 'poky/meta/recipes-devtools/tcf-agent')
3 files changed, 16 insertions, 61 deletions
diff --git a/poky/meta/recipes-devtools/tcf-agent/tcf-agent/0001-canonicalize_file_name-is-specific-to-glibc.patch b/poky/meta/recipes-devtools/tcf-agent/tcf-agent/0001-canonicalize_file_name-is-specific-to-glibc.patch deleted file mode 100644 index 5f93c46f2..000000000 --- a/poky/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 <raj.khem@gmail.com> -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 <raj.khem@gmail.com> ---- -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/poky/meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch b/poky/meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch index b66f41ad2..abd33babe 100644 --- a/poky/meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch +++ b/poky/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 <ross.burton@intel.com> 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/poky/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb b/poky/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb index ba14c4269..d901c18c3 100644 --- a/poky/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb +++ b/poky/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<pver>(\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 \ " @@ -46,6 +45,7 @@ CFLAGS_append_mips = " ${LCL_STOP_SERVICES}" CFLAGS_append_mips64 = " ${LCL_STOP_SERVICES}" CFLAGS_append_libc-musl = " ${LCL_STOP_SERVICES}" CFLAGS_append_powerpc64 = " ${LCL_STOP_SERVICES}" +CFLAGS_append_riscv64 = " ${LCL_STOP_SERVICES}" do_install() { oe_runmake install INSTALLROOT=${D} |