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-24 09:40:29 +0000 |
commit | c2c92026e4e02364b84467464b5ff7411b771187 (patch) | |
tree | bc13bc9afac9597f0bf46c370c81a5bc2d1ebaac /meta/recipes-devtools/tcf-agent | |
parent | f294813dfee9ccc8a6f213178e30d175d3694524 (diff) | |
download | poky-c2c92026e4e02364b84467464b5ff7411b771187.tar.gz |
tcf-agent: Implement canonicalize_file_name() for musl as well
(From OE-Core rev: 6faa7294ebc4f9897e256cad4b6e16fb56faaab9)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/tcf-agent')
-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 @@ | |||
1 | From 23a3759b74d081b3b2849b0d37a0e5219f37813e Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 7 Jan 2016 22:37:48 +0000 | ||
4 | Subject: [PATCH] canonicalize_file_name is specific to glibc | ||
5 | |||
6 | When on Linux and not using glibc then we need to define | ||
7 | canonicalize_file_name() API, therefore add a check for finding out if | ||
8 | its not glibc | ||
9 | |||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | Upstream-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 | |||
18 | diff --git a/agent/tcf/framework/mdep.c b/agent/tcf/framework/mdep.c | ||
19 | index 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); | ||
31 | diff --git a/agent/tcf/framework/mdep.h b/agent/tcf/framework/mdep.h | ||
32 | index 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 | -- | ||
45 | 2.7.0 | ||
46 | |||
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+)+))" | |||
12 | SRC_URI = "git://git.eclipse.org/gitroot/tcf/org.eclipse.tcf.agent.git;branch=1.3_mars_bugfix \ | 12 | SRC_URI = "git://git.eclipse.org/gitroot/tcf/org.eclipse.tcf.agent.git;branch=1.3_mars_bugfix \ |
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 \ | ||
15 | file://tcf-agent.init \ | 16 | file://tcf-agent.init \ |
16 | file://tcf-agent.service \ | 17 | file://tcf-agent.service \ |
17 | " | 18 | " |