diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2016-01-08 09:02:48 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-22 23:42:51 +0000 |
| commit | 6faa7294ebc4f9897e256cad4b6e16fb56faaab9 (patch) | |
| tree | 0c3c7e6f345a097efc36f0a80f3bb2a8ddbd66e9 /meta | |
| parent | 52658750ffb40386b7677de0330c1ab147e8679b (diff) | |
| download | openembedded-core-contrib-6faa7294ebc4f9897e256cad4b6e16fb56faaab9.tar.gz | |
tcf-agent: Implement canonicalize_file_name() for musl as well
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-devtools/tcf-agent/tcf-agent/0001-canonicalize_file_name-is-specific-to-glibc.patch | 46 | ||||
| -rw-r--r-- | meta/recipes-devtools/tcf-agent/tcf-agent_git.bb | 1 |
2 files changed, 47 insertions, 0 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 new file mode 100644 index 0000000000..5f93c46f29 --- /dev/null +++ b/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/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb index fff81a568c..ab2fcd7abc 100644 --- a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb +++ b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb @@ -12,6 +12,7 @@ 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 \ " |