diff mbox series

[1/1] tcf-agent: bump to version 1.7.0

Message ID 20180412151310.15252-1-eugene@largest.net
State Accepted
Headers show
Series [1/1] tcf-agent: bump to version 1.7.0 | expand

Commit Message

Evgueni Tarassov April 12, 2018, 3:13 p.m. UTC
Build issues with MicroBlaze and PPC64 targets are fixed

Signed-off-by: Eugene Tarassov <eugene@largest.net>
---
 ...gent-add-install-target-to-the-CMakeLists.patch |  48 ----------
 ...-remove-explicit-uses-of-__ptrace_request.patch | 103 ---------------------
 ...de-canonicalize_file_name-for-all-c-libs-.patch |  46 ---------
 package/tcf-agent/Config.in                        |   5 +-
 package/tcf-agent/tcf-agent.hash                   |   2 +-
 package/tcf-agent/tcf-agent.mk                     |   2 +-
 6 files changed, 4 insertions(+), 202 deletions(-)
 delete mode 100644 package/tcf-agent/0001-agent-add-install-target-to-the-CMakeLists.patch
 delete mode 100644 package/tcf-agent/0002-linux-remove-explicit-uses-of-__ptrace_request.patch
 delete mode 100644 package/tcf-agent/0003-linux-provide-canonicalize_file_name-for-all-c-libs-.patch

Comments

Thomas Petazzoni April 12, 2018, 9:49 p.m. UTC | #1
Hello,

On Thu, 12 Apr 2018 08:13:10 -0700, Eugene Tarassov wrote:
> Build issues with MicroBlaze and PPC64 targets are fixed
> 
> Signed-off-by: Eugene Tarassov <eugene@largest.net>

Thanks Eugene for this patch. However, Norbert had already sent a patch
to bump to 1.7.0, and his patch raised a number of questions that
haven't been answered:

  http://patchwork.ozlabs.org/patch/880414/

In particular, Norbert submission was adding two patches to fix build
issues, and doing a lot more changes in tcf-agent.mk. I'm wondering why
your patch is so different, and doesn't include Norbert changes.

Thanks,

Thomas
Evgueni Tarassov April 13, 2018, 1:50 a.m. UTC | #2
Hi Thomas,

I was not aware Norbert had already sent a patch.

His patch appears to make other changes in addition to selecting newer 
version, like switching to make from cmake, some changes from after 
1.7.0, and support for static linking.
My goal was less ambitious: just version up to 1.7.0 - for now, and 
delete old patches - they are not needed anymore because of upstream fixes.
I'm new to Buildroot. So far, I don't even understand the need to switch 
to make or to support static linking of tcf-agent.
Anyway, I, personally, would prefer to handle tcf-agent issues upstream, 
through eclipse.org, without having patches in the Buildroot package.

Regards,
Eugene

On 4/12/2018 2:49 PM, Thomas Petazzoni wrote:
> Hello,
>
> On Thu, 12 Apr 2018 08:13:10 -0700, Eugene Tarassov wrote:
>> Build issues with MicroBlaze and PPC64 targets are fixed
>>
>> Signed-off-by: Eugene Tarassov <eugene@largest.net>
> Thanks Eugene for this patch. However, Norbert had already sent a patch
> to bump to 1.7.0, and his patch raised a number of questions that
> haven't been answered:
>
>    http://patchwork.ozlabs.org/patch/880414/
>
> In particular, Norbert submission was adding two patches to fix build
> issues, and doing a lot more changes in tcf-agent.mk. I'm wondering why
> your patch is so different, and doesn't include Norbert changes.
>
> Thanks,
>
> Thomas
Norbert Lange April 13, 2018, 7:50 a.m. UTC | #3
Hello,

there seems to be a misunderstanding, I probably should have refered
to the patch directly.

@Thomas: Part of the discussion resides in
https://bugs.eclipse.org/bugs/show_bug.cgi?id=529417,
Eugene is the the maintainer of tcf-agent and I advised him to put his
mail in DEVELOPERS,
as otherwise I have to piggyback issues and fixes around projects.
Also there are apparently multiple (closed source) projects using
tcf-agent, so a my fixes for linux
might break other stuff.

I switched from CMake to regular Makefiles for the same reason, the
later is better supported upstream,
and support detecting headers/functions/libraries from the system.
Getting CMake to parity would be alot
work.

@Eugene: buildroot allows static linking, which can come handy for
stuff like initial ramdisks which only need a
small set of tools (eg. only busybox without any libraries)

I will try to respond to Thomas' requests for the patch this weekend,
but can you look at the empty ranlib call?
My solution would be to set the makerule to

$(BINDIR)/libtcf$(EXTLIB) : $(OFILES)
    $(AR) $(AR_FLAGS) $(AR_OUT_F)$@ $^
    $(RANLIB) $@

(and fixup the variable definitions in Makefile.inc)

Norbert

2018-04-13 3:50 GMT+02:00 Evgueni Tarassov <eugene@largest.net>:
> Hi Thomas,
>
> I was not aware Norbert had already sent a patch.
>
> His patch appears to make other changes in addition to selecting newer
> version, like switching to make from cmake, some changes from after 1.7.0,
> and support for static linking.
> My goal was less ambitious: just version up to 1.7.0 - for now, and delete
> old patches - they are not needed anymore because of upstream fixes.
> I'm new to Buildroot. So far, I don't even understand the need to switch to
> make or to support static linking of tcf-agent.
> Anyway, I, personally, would prefer to handle tcf-agent issues upstream,
> through eclipse.org, without having patches in the Buildroot package.
>
> Regards,
> Eugene
>
>
> On 4/12/2018 2:49 PM, Thomas Petazzoni wrote:
>>
>> Hello,
>>
>> On Thu, 12 Apr 2018 08:13:10 -0700, Eugene Tarassov wrote:
>>>
>>> Build issues with MicroBlaze and PPC64 targets are fixed
>>>
>>> Signed-off-by: Eugene Tarassov <eugene@largest.net>
>>
>> Thanks Eugene for this patch. However, Norbert had already sent a patch
>> to bump to 1.7.0, and his patch raised a number of questions that
>> haven't been answered:
>>
>>    http://patchwork.ozlabs.org/patch/880414/
>>
>> In particular, Norbert submission was adding two patches to fix build
>> issues, and doing a lot more changes in tcf-agent.mk. I'm wondering why
>> your patch is so different, and doesn't include Norbert changes.
>>
>> Thanks,
>>
>> Thomas
>
>
Norbert Lange April 13, 2018, 7:53 a.m. UTC | #4
and just to clean this up:

adding your email to the DEVELOPERS file,
will mean that you are getting contacted on failures on the automated build,
and if someone adds patches that modify those sources.
https://buildroot.org/downloads/manual/manual.html#DEVELOPERS

Norbert

2018-04-13 9:50 GMT+02:00 Norbert Lange <nolange79@gmail.com>:
> Hello,
>
> there seems to be a misunderstanding, I probably should have refered
> to the patch directly.
>
> @Thomas: Part of the discussion resides in
> https://bugs.eclipse.org/bugs/show_bug.cgi?id=529417,
> Eugene is the the maintainer of tcf-agent and I advised him to put his
> mail in DEVELOPERS,
> as otherwise I have to piggyback issues and fixes around projects.
> Also there are apparently multiple (closed source) projects using
> tcf-agent, so a my fixes for linux
> might break other stuff.
>
> I switched from CMake to regular Makefiles for the same reason, the
> later is better supported upstream,
> and support detecting headers/functions/libraries from the system.
> Getting CMake to parity would be alot
> work.
>
> @Eugene: buildroot allows static linking, which can come handy for
> stuff like initial ramdisks which only need a
> small set of tools (eg. only busybox without any libraries)
>
> I will try to respond to Thomas' requests for the patch this weekend,
> but can you look at the empty ranlib call?
> My solution would be to set the makerule to
>
> $(BINDIR)/libtcf$(EXTLIB) : $(OFILES)
>     $(AR) $(AR_FLAGS) $(AR_OUT_F)$@ $^
>     $(RANLIB) $@
>
> (and fixup the variable definitions in Makefile.inc)
>
> Norbert
>
> 2018-04-13 3:50 GMT+02:00 Evgueni Tarassov <eugene@largest.net>:
>> Hi Thomas,
>>
>> I was not aware Norbert had already sent a patch.
>>
>> His patch appears to make other changes in addition to selecting newer
>> version, like switching to make from cmake, some changes from after 1.7.0,
>> and support for static linking.
>> My goal was less ambitious: just version up to 1.7.0 - for now, and delete
>> old patches - they are not needed anymore because of upstream fixes.
>> I'm new to Buildroot. So far, I don't even understand the need to switch to
>> make or to support static linking of tcf-agent.
>> Anyway, I, personally, would prefer to handle tcf-agent issues upstream,
>> through eclipse.org, without having patches in the Buildroot package.
>>
>> Regards,
>> Eugene
>>
>>
>> On 4/12/2018 2:49 PM, Thomas Petazzoni wrote:
>>>
>>> Hello,
>>>
>>> On Thu, 12 Apr 2018 08:13:10 -0700, Eugene Tarassov wrote:
>>>>
>>>> Build issues with MicroBlaze and PPC64 targets are fixed
>>>>
>>>> Signed-off-by: Eugene Tarassov <eugene@largest.net>
>>>
>>> Thanks Eugene for this patch. However, Norbert had already sent a patch
>>> to bump to 1.7.0, and his patch raised a number of questions that
>>> haven't been answered:
>>>
>>>    http://patchwork.ozlabs.org/patch/880414/
>>>
>>> In particular, Norbert submission was adding two patches to fix build
>>> issues, and doing a lot more changes in tcf-agent.mk. I'm wondering why
>>> your patch is so different, and doesn't include Norbert changes.
>>>
>>> Thanks,
>>>
>>> Thomas
>>
>>
Thomas Petazzoni April 13, 2018, 7:53 a.m. UTC | #5
Hello,

On Fri, 13 Apr 2018 09:50:35 +0200, Norbert Lange wrote:

> @Thomas: Part of the discussion resides in
> https://bugs.eclipse.org/bugs/show_bug.cgi?id=529417,
> Eugene is the the maintainer of tcf-agent and I advised him to put his
> mail in DEVELOPERS,
> as otherwise I have to piggyback issues and fixes around projects.
> Also there are apparently multiple (closed source) projects using
> tcf-agent, so a my fixes for linux
> might break other stuff.

OK.

> I switched from CMake to regular Makefiles for the same reason, the
> later is better supported upstream,
> and support detecting headers/functions/libraries from the system.
> Getting CMake to parity would be alot
> work.

That is rather odd. A build system like CMake normally helps a lot
resolve cross-compilation issues.

> @Eugene: buildroot allows static linking, which can come handy for
> stuff like initial ramdisks which only need a
> small set of tools (eg. only busybox without any libraries)
> 
> I will try to respond to Thomas' requests for the patch this weekend,
> but can you look at the empty ranlib call?
> My solution would be to set the makerule to
> 
> $(BINDIR)/libtcf$(EXTLIB) : $(OFILES)
>     $(AR) $(AR_FLAGS) $(AR_OUT_F)$@ $^
>     $(RANLIB) $@
> 
> (and fixup the variable definitions in Makefile.inc)

What about sticking to the CMake build system, and fixing whatever
issues you have ? This seems like a much more sensible approach than
using hand-written Makefiles.

Best regards,

Thomas
Thomas Petazzoni April 13, 2018, 8:13 a.m. UTC | #6
Hello,

On Thu, 12 Apr 2018 08:13:10 -0700, Eugene Tarassov wrote:
> Build issues with MicroBlaze and PPC64 targets are fixed
> 
> Signed-off-by: Eugene Tarassov <eugene@largest.net>
> ---
>  ...gent-add-install-target-to-the-CMakeLists.patch |  48 ----------
>  ...-remove-explicit-uses-of-__ptrace_request.patch | 103 ---------------------
>  ...de-canonicalize_file_name-for-all-c-libs-.patch |  46 ---------
>  package/tcf-agent/Config.in                        |   5 +-
>  package/tcf-agent/tcf-agent.hash                   |   2 +-
>  package/tcf-agent/tcf-agent.mk                     |   2 +-
>  6 files changed, 4 insertions(+), 202 deletions(-)
>  delete mode 100644 package/tcf-agent/0001-agent-add-install-target-to-the-CMakeLists.patch
>  delete mode 100644 package/tcf-agent/0002-linux-remove-explicit-uses-of-__ptrace_request.patch
>  delete mode 100644 package/tcf-agent/0003-linux-provide-canonicalize_file_name-for-all-c-libs-.patch

Applied to master, thanks.

Please send follow-up patches to further improve things if needed.
Moving from CMake to plain Makefiles is not really considered an
improvement, unless it's the decision from upstream to move away from
CMake.

Best regards,

Thomas
Norbert Lange April 13, 2018, 9:32 a.m. UTC | #7
2018-04-13 10:13 GMT+02:00 Thomas Petazzoni <thomas.petazzoni@bootlin.com>:
>
> Please send follow-up patches to further improve things if needed.
> Moving from CMake to plain Makefiles is not really considered an
> improvement, unless it's the decision from upstream to move away from
> CMake.

There aren't any features of CMake used,
not for detecting libraries, not for detecting headers, not for getting flags,
all of this is missing compared to the Makefile. All that's there is a
subset of the fixed flags + logic from other buildsystems.
If that's an improvement for you, then there's not much left to discuss.

Proper CMake support would need all that (at which point it is surely
better than make),
and I expect you will get alot of warnings now in builds, since some
feature detection macros are missing.
I wont add proper CMake support myself (as I first considered it), as
I would have to dissect the information form other build-systems,
and keep it current every new version.

Norbert
Thomas Petazzoni April 13, 2018, 11:18 a.m. UTC | #8
Hello,

On Fri, 13 Apr 2018 11:32:52 +0200, Norbert Lange wrote:

> There aren't any features of CMake used,
> not for detecting libraries, not for detecting headers, not for getting flags,
> all of this is missing compared to the Makefile. All that's there is a
> subset of the fixed flags + logic from other buildsystems.
> If that's an improvement for you, then there's not much left to discuss.
> 
> Proper CMake support would need all that (at which point it is surely
> better than make),
> and I expect you will get alot of warnings now in builds, since some
> feature detection macros are missing.

I build tcf-agent 1.7.0, using the patch provided by Eugene, and it
built without warnings.

> I wont add proper CMake support myself (as I first considered it), as
> I would have to dissect the information form other build-systems,
> and keep it current every new version.

Maybe we should just ask Eugene was is the official and
upstream-supported build system for tcf-agent. Using CMake instead of
hand-written Makefiles definitely makes a lot of sense. It does work
today, and if there are some issues with it, they can be fixed.

Look at your patch that was fixing the static linking issue with
OpenSSL. CMake has built-in support for detecting libraries using
pkg-config, automatically solving such static linking issues.

Best regards,

Thomas
Norbert Lange April 13, 2018, 11:33 a.m. UTC | #9
2018-04-13 13:18 GMT+02:00 Thomas Petazzoni <thomas.petazzoni@bootlin.com>:
> Hello,
>
> On Fri, 13 Apr 2018 11:32:52 +0200, Norbert Lange wrote:
>
>> There aren't any features of CMake used,
>> not for detecting libraries, not for detecting headers, not for getting flags,
>> all of this is missing compared to the Makefile. All that's there is a
>> subset of the fixed flags + logic from other buildsystems.
>> If that's an improvement for you, then there's not much left to discuss.
>>
>> Proper CMake support would need all that (at which point it is surely
>> better than make),
>> and I expect you will get alot of warnings now in builds, since some
>> feature detection macros are missing.
>
> I build tcf-agent 1.7.0, using the patch provided by Eugene, and it
> built without warnings.
>
>> I wont add proper CMake support myself (as I first considered it), as
>> I would have to dissect the information form other build-systems,
>> and keep it current every new version.
>
> Maybe we should just ask Eugene was is the official and
> upstream-supported build system for tcf-agent. Using CMake instead of
> hand-written Makefiles definitely makes a lot of sense. It does work
> today, and if there are some issues with it, they can be fixed.

Please separate what CMake could do, and what it does in the concrete example,
especially in the state it is right NOW.
I already raised this in the Bugzilla, and I cant speak for upstream,
but my understanding is that improvements wont originate from upstream.

>
> Look at your patch that was fixing the static linking issue with
> OpenSSL. CMake has built-in support for detecting libraries using
> pkg-config, automatically solving such static linking issues.

I am pretty sure the failure I had with the Makefile is there too.
Cant test this today,
but I can tell you that I did not change *from* CMake (which I
otherwise try to use everywhere)
without reason.

Use CMake as soon as its properly supported, but not when its the
worse choice right now.

Norbert
diff mbox series

Patch

diff --git a/package/tcf-agent/0001-agent-add-install-target-to-the-CMakeLists.patch b/package/tcf-agent/0001-agent-add-install-target-to-the-CMakeLists.patch
deleted file mode 100644
index fd2d61f3da..0000000000
--- a/package/tcf-agent/0001-agent-add-install-target-to-the-CMakeLists.patch
+++ /dev/null
@@ -1,48 +0,0 @@ 
-From 96c43b223c90746cb2f680d6d5e198afc690dd4d Mon Sep 17 00:00:00 2001
-From: Norbert Lange <nolange79@gmail.com>
-Date: Mon, 4 Dec 2017 10:56:45 +0100
-Subject: [PATCH] agent: add install target to the CMakeLists
-
-It is common for CMake packages to make sure that 'make install'
-works properly, and that's what most users expect.
-
-More specifically, build systems such as Buildroot also expect
-'make install' to do the right thing for CMake-based packages
-
-Signed-off-by: Norbert Lange <nolange79@gmail.com>
----
- agent/CMakeLists.txt | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/agent/CMakeLists.txt b/agent/CMakeLists.txt
-index aef15b96..605862b2 100644
---- a/agent/CMakeLists.txt
-+++ b/agent/CMakeLists.txt
-@@ -1,6 +1,8 @@
- # -*- cmake -*-
- 
- cmake_minimum_required(VERSION 2.8)
-+project(tcfagent C)
-+include(GNUInstallDirs)
- 
- set(CMAKE_COLOR_MAKEFILE OFF)
- 
-@@ -43,3 +45,15 @@ message(STATUS "machine:" ${TCF_MACHINE})
- 
- add_executable(agent tcf/main/main.c)
- target_link_libraries(agent ${TCF_LIB_NAME})
-+
-+# executable and library cant have the same target name,
-+# but we can rename the output
-+set_target_properties(agent
-+        PROPERTIES OUTPUT_NAME tcf-agent)
-+
-+# add target to install all outputs
-+install(TARGETS agent ${TCF_LIB_NAME}
-+  RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR}
-+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+)
--- 
-2.15.1
-
diff --git a/package/tcf-agent/0002-linux-remove-explicit-uses-of-__ptrace_request.patch b/package/tcf-agent/0002-linux-remove-explicit-uses-of-__ptrace_request.patch
deleted file mode 100644
index 5c820394a3..0000000000
--- a/package/tcf-agent/0002-linux-remove-explicit-uses-of-__ptrace_request.patch
+++ /dev/null
@@ -1,103 +0,0 @@ 
-From 3e662598e1d9ad682e470988764c3af5b1a78cb7 Mon Sep 17 00:00:00 2001
-From: Norbert Lange <nolange79@gmail.com>
-Date: Fri, 1 Dec 2017 13:15:50 +0100
-Subject: [PATCH] linux: remove explicit uses of __ptrace_request
-
-This type is not to be used directly, and with musl it wont build
-
-Signed-off-by: Norbert Lange <nolange79@gmail.com>
----
- agent/machine/arm/tcf/cpudefs-mdep.c       |  4 ++--
- agent/machine/arm/tcf/regset-mdep.h        |  4 ++--
- agent/system/GNU/Linux/tcf/context-linux.c | 18 +++++++++---------
- 3 files changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/agent/machine/arm/tcf/cpudefs-mdep.c b/agent/machine/arm/tcf/cpudefs-mdep.c
-index 27ab0129..0bc8b146 100644
---- a/agent/machine/arm/tcf/cpudefs-mdep.c
-+++ b/agent/machine/arm/tcf/cpudefs-mdep.c
-@@ -89,10 +89,10 @@ static RegisterDefinition * lr_def = NULL;
- static RegisterDefinition * cpsr_def = NULL;
- 
- #if !defined(PTRACE_GETHBPREGS)
--#define PTRACE_GETHBPREGS (enum __ptrace_request)29
-+#define PTRACE_GETHBPREGS 29
- #endif
- #if !defined(PTRACE_SETHBPREGS)
--#define PTRACE_SETHBPREGS (enum __ptrace_request)30
-+#define PTRACE_SETHBPREGS 30
- #endif
- 
- #define ARM_DEBUG_ARCH_V6       1
-diff --git a/agent/machine/arm/tcf/regset-mdep.h b/agent/machine/arm/tcf/regset-mdep.h
-index e5516042..893ba64f 100644
---- a/agent/machine/arm/tcf/regset-mdep.h
-+++ b/agent/machine/arm/tcf/regset-mdep.h
-@@ -28,11 +28,11 @@
- #endif
- 
- #ifndef PTRACE_GETREGSET
--#define PTRACE_GETREGSET (enum __ptrace_request)0x4204
-+#define PTRACE_GETREGSET 0x4204
- #endif
- 
- #ifndef PTRACE_SETREGSET
--#define PTRACE_SETREGSET (enum __ptrace_request)0x4205
-+#define PTRACE_SETREGSET 0x4205
- #endif
- 
- struct regset_gp {
-diff --git a/agent/system/GNU/Linux/tcf/context-linux.c b/agent/system/GNU/Linux/tcf/context-linux.c
-index d4eb5e6b..4c86021e 100644
---- a/agent/system/GNU/Linux/tcf/context-linux.c
-+++ b/agent/system/GNU/Linux/tcf/context-linux.c
-@@ -60,10 +60,10 @@
- #endif
- 
- #if !defined(PTRACE_SETOPTIONS)
--#define PTRACE_SETOPTIONS       (enum __ptrace_request)0x4200
--#define PTRACE_GETEVENTMSG      (enum __ptrace_request)0x4201
--#define PTRACE_GETSIGINFO       (enum __ptrace_request)0x4202
--#define PTRACE_SETSIGINFO       (enum __ptrace_request)0x4203
-+#define PTRACE_SETOPTIONS       0x4200
-+#define PTRACE_GETEVENTMSG      0x4201
-+#define PTRACE_GETSIGINFO       0x4202
-+#define PTRACE_SETSIGINFO       0x4203
- 
- #define PTRACE_O_TRACESYSGOOD   0x00000001
- #define PTRACE_O_TRACEFORK      0x00000002
-@@ -85,8 +85,8 @@
- 
- #if defined(__arm__) || defined(__aarch64__)
- #if !defined(PTRACE_GETVFPREGS)
--#define PTRACE_GETVFPREGS       (enum __ptrace_request)27
--#define PTRACE_SETVFPREGS       (enum __ptrace_request)28
-+#define PTRACE_GETVFPREGS       27
-+#define PTRACE_SETVFPREGS       28
- #endif
- #endif
- 
-@@ -483,7 +483,7 @@ static const char * get_ptrace_cmd_name(int cmd) {
- static int do_single_step(Context * ctx) {
-     uint32_t is_cont = 0;
-     ContextExtensionLinux * ext = EXT(ctx);
--    enum __ptrace_request cmd = PTRACE_SINGLESTEP;
-+    int cmd = PTRACE_SINGLESTEP;
- 
-     assert(!ext->pending_step);
- 
-@@ -540,9 +540,9 @@ int context_continue(Context * ctx) {
-     int signal = 0;
-     ContextExtensionLinux * ext = EXT(ctx);
- #if USE_PTRACE_SYSCALL
--    enum __ptrace_request cmd = PTRACE_SYSCALL;
-+    int cmd = PTRACE_SYSCALL;
- #else
--    enum __ptrace_request cmd = PTRACE_CONT;
-+    int cmd = PTRACE_CONT;
- #endif
- 
-     assert(is_dispatch_thread());
--- 
-2.15.1
-
diff --git a/package/tcf-agent/0003-linux-provide-canonicalize_file_name-for-all-c-libs-.patch b/package/tcf-agent/0003-linux-provide-canonicalize_file_name-for-all-c-libs-.patch
deleted file mode 100644
index 8532307d90..0000000000
--- a/package/tcf-agent/0003-linux-provide-canonicalize_file_name-for-all-c-libs-.patch
+++ /dev/null
@@ -1,46 +0,0 @@ 
-From 1323aa4459004b9817f0cfbf4b59c31480d527cf Mon Sep 17 00:00:00 2001
-From: Norbert Lange <nolange79@gmail.com>
-Date: Fri, 1 Dec 2017 13:34:08 +0100
-Subject: [PATCH] linux: provide canonicalize_file_name for all c libs except
- glibc
-
-musl was not covered so far, and this library does not define a
-macro for detection.
-unless glibc is detected, a canonicalize_file_name implementation
-will be provided.
-
-Signed-off-by: Norbert Lange <nolange79@gmail.com>
----
- 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 8aee811f..d38036be 100644
---- a/agent/tcf/framework/mdep.c
-+++ b/agent/tcf/framework/mdep.c
-@@ -1097,7 +1097,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 f90f03f2..3e331383 100644
---- a/agent/tcf/framework/mdep.h
-+++ b/agent/tcf/framework/mdep.h
-@@ -292,7 +292,7 @@ extern int loc_clock_gettime(int, struct timespec *);
- 
- #define O_BINARY 0
- 
--#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__sun__)
-+#if (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__sun__)) | !defined (__GLIBC__)
- #  define O_LARGEFILE 0
- extern char ** environ;
- extern char * canonicalize_file_name(const char * path);
--- 
-2.15.1
-
diff --git a/package/tcf-agent/Config.in b/package/tcf-agent/Config.in
index 9cd283107a..50e58642b0 100644
--- a/package/tcf-agent/Config.in
+++ b/package/tcf-agent/Config.in
@@ -28,9 +28,8 @@  config BR2_PACKAGE_TCF_AGENT_ARCH
 	default "i386"       if BR2_i386 && !BR2_ARCH="i686"
 	default "x86_64"     if BR2_x86_64
 	default "powerpc"    if BR2_powerpc || BR2_powerpcle
-#	those architectures fail to build currently
-#	default "ppc64"      if BR2_powerpc64 || BR2_powerpc64le
-#	default "microblaze" if BR2_microblaze || BR2_microblazeel
+	default "ppc64"      if BR2_powerpc64 || BR2_powerpc64le
+	default "microblaze" if BR2_microblaze || BR2_microblazeel
 
 config BR2_PACKAGE_TCF_AGENT_ARCH_SUPPORTS
 	bool
diff --git a/package/tcf-agent/tcf-agent.hash b/package/tcf-agent/tcf-agent.hash
index d46d5206a3..3ff4d9a546 100644
--- a/package/tcf-agent/tcf-agent.hash
+++ b/package/tcf-agent/tcf-agent.hash
@@ -1,5 +1,5 @@ 
 # Locally computed:
-sha256  94e9277a52929791417d59b515235bf28ca29ffb05c9e89ad331ebc3256fb5df  org.eclipse.tcf.agent-1.6.0.tar.gz
+sha256  2f8c7be8a0bf7c86c72fd5680bc19a9e8f98792d40c94a0fee30ceb6428b8f33  org.eclipse.tcf.agent-1.7.0.tar.gz
 
 # Hash for license files:
 sha256  f82d01b74a513bd3504d08136026a5ac2a7e6ff62ebcde391fa74aa222d11ce0  agent/edl-v10.html
diff --git a/package/tcf-agent/tcf-agent.mk b/package/tcf-agent/tcf-agent.mk
index 7b615d3120..5a0a991b1d 100644
--- a/package/tcf-agent/tcf-agent.mk
+++ b/package/tcf-agent/tcf-agent.mk
@@ -4,7 +4,7 @@ 
 #
 ################################################################################
 
-TCF_AGENT_VERSION = 1.6.0
+TCF_AGENT_VERSION = 1.7.0
 # the tar.xz link was broken the time this file got authored
 TCF_AGENT_SOURCE = org.eclipse.tcf.agent-$(TCF_AGENT_VERSION).tar.gz
 TCF_AGENT_SITE = http://git.eclipse.org/c/tcf/org.eclipse.tcf.agent.git/snapshot