[Buildroot] [PATCH 1/2] ltrace: remove bogus comment in Config.in file

[Buildroot] [PATCH 1/2] ltrace: remove bogus comment in Config.in file

[Thomas Petazzoni]

In commit dfaa18af00dfcff71a0159adaafb0880e58fa6a1 ("ltrace: disable
on mips/mipsel"), ltrace was disabled on mips/mipsel due to build
issues, and a comment was added in the Config.in file to explain that
even though ltrace has mips/mipsel support, it isn't enabled because
it doesn't build.

Then, in commit d23cce19c299e3010ba2dca84ab4ad35eff3cdbb ("ltrace:
enable for mips/mipsel"), the build of ltrace on mips/mipsel was
re-enabled, because it has been fixed upstream.

However, the comment in the Config.in comment was not removed in this
commit. Due to this, we have a comment that says "we don't allow
enabling ltrace on mips/mipsel" and the line right below precisely
allows to enable ltrace on mips/mipsel.

Fix this inconsistency by removing the no longer valid comment.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 package/ltrace/Config.in | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package/ltrace/Config.in b/package/ltrace/Config.in
index 4d5fb723d6..3a46b6a4f6 100644
--- a/package/ltrace/Config.in
+++ b/package/ltrace/Config.in
@@ -3,10 +3,6 @@ config BR2_PACKAGE_LTRACE
 	depends on BR2_USE_WCHAR # elfutils
 	depends on !BR2_STATIC_LIBS # elfutils
 	depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils
-	# ltrace normally has mips/mipsel support, but it's currently
-	# broken (error: 'struct ltelf' has no member named
-	# 'relplt_count'). Issue reported upstream at
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=756764.
 	depends on (BR2_i386 || BR2_arm || BR2_mips || BR2_mipsel \
 		|| BR2_powerpc || BR2_sparc || BR2_x86_64 || BR2_xtensa)
 	select BR2_PACKAGE_ELFUTILS
-- 
2.14.3

[Buildroot] [PATCH 2/2] ltrace: fix visibility of Config.in comment

[Thomas Petazzoni]

The BR2_PACKAGE_LTRACE option has some architecture dependencies, but
those architecture dependencies are not taken into account for the
Config.in comment.

To fix this, this commit introduces a BR2_PACKAGE_LTRACE_ARCH_SUPPORTS
hidden boolean that gets used by both the BR2_PACKAGE_LTRACE option
and the Config.in comment.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 package/ltrace/Config.in | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/package/ltrace/Config.in b/package/ltrace/Config.in
index 3a46b6a4f6..2defbe28a0 100644
--- a/package/ltrace/Config.in
+++ b/package/ltrace/Config.in
@@ -1,10 +1,20 @@
+config BR2_PACKAGE_LTRACE_ARCH_SUPPORTS
+	bool
+	default y if BR2_arm
+	default y if BR2_i386
+	default y if BR2_mips
+	default y if BR2_mipsel
+	default y if BR2_powerpc
+	default y if BR2_sparc
+	default y if BR2_x86_64
+	default y if BR2_xtensa
+
 config BR2_PACKAGE_LTRACE
 	bool "ltrace"
 	depends on BR2_USE_WCHAR # elfutils
 	depends on !BR2_STATIC_LIBS # elfutils
 	depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils
-	depends on (BR2_i386 || BR2_arm || BR2_mips || BR2_mipsel \
-		|| BR2_powerpc || BR2_sparc || BR2_x86_64 || BR2_xtensa)
+	depends on BR2_PACKAGE_LTRACE_ARCH_SUPPORTS
 	select BR2_PACKAGE_ELFUTILS
 	help
 	  Debugging program which runs a specified command until it
@@ -15,5 +25,6 @@ config BR2_PACKAGE_LTRACE
 	  http://ltrace.org
 
 comment "ltrace needs a uClibc or glibc toolchain w/ wchar, dynamic library"
+	depends on BR2_PACKAGE_LTRACE_ARCH_SUPPORTS
 	depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \
 		|| !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC)
-- 
2.14.3

[Buildroot] [PATCH 2/2] ltrace: fix visibility of Config.in comment

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes:

 > The BR2_PACKAGE_LTRACE option has some architecture dependencies, but
 > those architecture dependencies are not taken into account for the
 > Config.in comment.

 > To fix this, this commit introduces a BR2_PACKAGE_LTRACE_ARCH_SUPPORTS
 > hidden boolean that gets used by both the BR2_PACKAGE_LTRACE option
 > and the Config.in comment.

 > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

Committed to 2018.02.x, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 1/2] ltrace: remove bogus comment in Config.in file

[Thomas Petazzoni]

Hello,

On Sat, 19 May 2018 22:55:01 +0200, Thomas Petazzoni wrote:
> In commit dfaa18af00dfcff71a0159adaafb0880e58fa6a1 ("ltrace: disable
> on mips/mipsel"), ltrace was disabled on mips/mipsel due to build
> issues, and a comment was added in the Config.in file to explain that
> even though ltrace has mips/mipsel support, it isn't enabled because
> it doesn't build.
> 
> Then, in commit d23cce19c299e3010ba2dca84ab4ad35eff3cdbb ("ltrace:
> enable for mips/mipsel"), the build of ltrace on mips/mipsel was
> re-enabled, because it has been fixed upstream.
> 
> However, the comment in the Config.in comment was not removed in this
> commit. Due to this, we have a comment that says "we don't allow
> enabling ltrace on mips/mipsel" and the line right below precisely
> allows to enable ltrace on mips/mipsel.
> 
> Fix this inconsistency by removing the no longer valid comment.
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> ---
>  package/ltrace/Config.in | 4 ----
>  1 file changed, 4 deletions(-)

I've applied those two patches to master.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH 1/2] ltrace: remove bogus comment in Config.in file

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes:

 > In commit dfaa18af00dfcff71a0159adaafb0880e58fa6a1 ("ltrace: disable
 > on mips/mipsel"), ltrace was disabled on mips/mipsel due to build
 > issues, and a comment was added in the Config.in file to explain that
 > even though ltrace has mips/mipsel support, it isn't enabled because
 > it doesn't build.

 > Then, in commit d23cce19c299e3010ba2dca84ab4ad35eff3cdbb ("ltrace:
 > enable for mips/mipsel"), the build of ltrace on mips/mipsel was
 > re-enabled, because it has been fixed upstream.

 > However, the comment in the Config.in comment was not removed in this
 > commit. Due to this, we have a comment that says "we don't allow
 > enabling ltrace on mips/mipsel" and the line right below precisely
 > allows to enable ltrace on mips/mipsel.

 > Fix this inconsistency by removing the no longer valid comment.

 > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

Committed to 2018.02.x, thanks.

-- 
Bye, Peter Korsgaard