diff options
Diffstat (limited to 'yocto-poky/meta/recipes-devtools/tcf-agent')
3 files changed, 77 insertions, 0 deletions
diff --git a/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent/0001-canonicalize_file_name-is-specific-to-glibc.patch b/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent/0001-canonicalize_file_name-is-specific-to-glibc.patch new file mode 100644 index 000000000..5f93c46f2 --- /dev/null +++ b/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent/0001-canonicalize_file_name-is-specific-to-glibc.patch @@ -0,0 +1,46 @@ +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/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent/ldflags.patch b/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent/ldflags.patch new file mode 100644 index 000000000..c03c55d22 --- /dev/null +++ b/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent/ldflags.patch @@ -0,0 +1,28 @@ +Upstream-Status: Pending + +From d92af0483c20365fd0af740d0baef8870b4aa374 Mon Sep 17 00:00:00 2001 +From: Abdur Rehman <abdur_rehman@mentor.com> +Date: Wed, 26 Aug 2015 19:18:11 +0500 +Subject: [PATCH] tcf-agent: obey LDFLAGS + +Signed-off-by: Abdur Rehman <abdur_rehman@mentor.com> +--- + Makefile.inc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.inc b/Makefile.inc +index 959028f..3148942 100644 +--- a/Makefile.inc ++++ b/Makefile.inc +@@ -96,7 +96,7 @@ NO_LINK_F ?= -c + # Linker definition and flags + + LINK ?= $(CC) +-LINK_FLAGS ?= $(CFLAGS) ++LINK_FLAGS ?= $(LDFLAGS) $(CFLAGS) + LINK_OUT_F ?= $(OUT_OBJ_F) + + # Archiver definition and flags +-- +1.7.9.5 + diff --git a/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb b/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb index f8fd39042..ab2fcd7ab 100644 --- a/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb +++ b/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb @@ -8,8 +8,11 @@ LIC_FILES_CHKSUM = "file://edl-v10.html;md5=522a390a83dc186513f0500543ad3679" SRCREV = "b9a735e9c7cf82f80d412b7ab15d08b89d5a4ccc" PV = "1.3.0+git${SRCPV}" +UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" SRC_URI = "git://git.eclipse.org/gitroot/tcf/org.eclipse.tcf.agent.git;branch=1.3_mars_bugfix \ 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 \ " |
