Skip to contentSkip to conversation

tools/Makefile.sources: fix igt_stats complie error on android

PATCH In review Derek Morton 1 participant 2 messages Jul 23, 2015 – Jul 24, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tools/Makefile.sources: fix igt_stats complie error on android

There are two versions of igt_stats.c in tools and lib\tests which causes the build system to have two build modules with the same name.
This patch specifies a different target name for the tool so there is no clash.

---
 tools/Makefile.sources | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
tools/Makefile.sources +7 -1
index 8ca9351..d19ef96 100644
@@ -5,7 +5,7 @@ noinst_PROGRAMS = \
 	$(NULL)
 
 bin_PROGRAMS = 				\
-	igt_stats			\
+	igt_statistics			\
 	intel_audio_dump 		\
 	intel_reg			\
 	intel_backlight 		\
@@ -63,3 +63,9 @@ intel_l3_parity_SOURCES =	\
 	intel_l3_parity.h	\
 	intel_l3_udev_listener.c
 
+# Android does not like building multiple targets with the same name
+# tools/igt_stats.c clashes with lib/tests/igt_stats.c. Simplest fix is to
+# specify a different target name here.
+igt_statistics_SOURCES =	\
+	igt_stats.c
+
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

Found a simpler way of doing this using 'LOCAL_MODULE'. Will prepare a replacement patch.

//Derek

Quoted 40 lines

-----Original Message-----
From: Morton, Derek J
Sent: Thursday, July 23, 2015 1:59 PM
To: [email protected]
Cc: Wood, Thomas; Gore, Tim; Morton, Derek J
Subject: [PATCH i-g-t] tools/Makefile.sources: fix igt_stats complie error on android

There are two versions of igt_stats.c in tools and lib\tests which causes the build system to have two build modules with the same name. This patch specifies a different target name for the tool so there is no clash.

---
tools/Makefile.sources | 8 +++++++-

1 file changed, 7 insertions(+), 1 deletion(-)
tools/Makefile.sources +7 -2
@@ -5,7 +5,7 @@ noinst_PROGRAMS = \
 	$(NULL)
 
 bin_PROGRAMS = 				\
-	igt_stats			\
+	igt_statistics			\
 	intel_audio_dump 		\
 	intel_reg			\
 	intel_backlight 		\
@@ -63,3 +63,9 @@ intel_l3_parity_SOURCES =	\
 	intel_l3_parity.h	\
 	intel_l3_udev_listener.c
 
+# Android does not like building multiple targets with the same name # 
+tools/igt_stats.c clashes with lib/tests/igt_stats.c. Simplest fix is 
+to # specify a different target name here.
+igt_statistics_SOURCES =	\
+	igt_stats.c
+
--
Quoted 3 lines

1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx