* Re: [PATCH i-g-t] tools/Android.mk: Add zlib support
@ 2016-01-15 15:49 Morton, Derek J
2016-01-15 15:59 ` Damien Lespiau
2020-02-13 22:50 ` [Intel-gfx] ✗ Fi.CI.BAT: failure for " Patchwork
0 siblings, 2 replies; 3+ messages in thread
From: Morton, Derek J @ 2016-01-15 15:49 UTC (permalink / raw)
To: intel-gfx; +Cc: Wood, Thomas
Can this be merged so IGT on Android builds? No one has raise any objections since Monday about this patch.
//Derek
-----Original Message-----
From: Morton, Derek J
Sent: Monday, January 11, 2016 1:32 PM
To: intel-gfx@lists.freedesktop.org
Cc: Wood, Thomas; Gore, Tim; chris@chris-wilson.co.uk; Morton, Derek J
Subject: [PATCH] tools/Android.mk: Add zlib support
IGT does not build for Android due to a zlib dependency being added to intel_error_decode.c in a recent patch.
This patch fixes the error by updating the Android makefile to add the path to the zlib library and using any LDFLAGS specified in Makefile.sources.
Signed-off-by: Derek Morton <derek.j.morton@intel.com>
---
tools/Android.mk | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/tools/Android.mk b/tools/Android.mk index 934d3a1..da4f3c0 100644
--- a/tools/Android.mk
+++ b/tools/Android.mk
@@ -23,9 +23,14 @@ define add_tool
LOCAL_CFLAGS += -Wno-error=return-type
# Excessive complaining for established cases. Rely on the Linux version warnings.
LOCAL_CFLAGS += -Wno-sign-compare
+ ifeq ($($(1)_LDFLAGS),)
+ else
+ LOCAL_LDFLAGS += $($(1)_LDFLAGS)
+ endif
LOCAL_C_INCLUDES = $(LOCAL_PATH)/../lib
LOCAL_C_INCLUDES += ${ANDROID_BUILD_TOP}/external/PRIVATE/drm/include/drm
+ LOCAL_C_INCLUDES += ${ANDROID_BUILD_TOP}/external/zlib
LOCAL_MODULE := $1_tool
LOCAL_MODULE_TAGS := optional
--
1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH i-g-t] tools/Android.mk: Add zlib support
2016-01-15 15:49 [PATCH i-g-t] tools/Android.mk: Add zlib support Morton, Derek J
@ 2016-01-15 15:59 ` Damien Lespiau
2020-02-13 22:50 ` [Intel-gfx] ✗ Fi.CI.BAT: failure for " Patchwork
1 sibling, 0 replies; 3+ messages in thread
From: Damien Lespiau @ 2016-01-15 15:59 UTC (permalink / raw)
To: Morton, Derek J; +Cc: intel-gfx, Wood, Thomas
On Fri, Jan 15, 2016 at 03:49:00PM +0000, Morton, Derek J wrote:
> Can this be merged so IGT on Android builds? No one has raise any
> objections since Monday about this patch.
Merged, thanks for the patch.
--
Damien
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Intel-gfx] ✗ Fi.CI.BAT: failure for tools/Android.mk: Add zlib support
2016-01-15 15:49 [PATCH i-g-t] tools/Android.mk: Add zlib support Morton, Derek J
2016-01-15 15:59 ` Damien Lespiau
@ 2020-02-13 22:50 ` Patchwork
1 sibling, 0 replies; 3+ messages in thread
From: Patchwork @ 2020-02-13 22:50 UTC (permalink / raw)
To: Derek Morton; +Cc: intel-gfx
== Series Details ==
Series: tools/Android.mk: Add zlib support
URL : https://patchwork.freedesktop.org/series/2543/
State : failure
== Summary ==
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dcn20/dcn20_dpp_cm.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dcn20/dcn20_hubp.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dcn20/dcn20_mpc.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dcn20/dcn20_opp.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dcn20/dcn20_hubbub.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dcn20/dcn20_optc.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dcn20/dcn20_mmhubbub.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dcn20/dcn20_stream_encoder.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dcn20/dcn20_link_encoder.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dcn20/dcn20_dccg.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dcn20/dcn20_vmid.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dcn20/dcn20_dwb.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dcn20/dcn20_dwb_scl.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dcn20/dcn20_dsc.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dsc/dc_dsc.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dsc/rc_calc.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dsc/rc_calc_dpi.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_init.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_resource.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_ipp.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hw_sequencer_debug.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_dpp.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_opp.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_optc.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hubp.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_mpc.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_dpp_dscl.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_dpp_cm.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_cm_common.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_hubbub.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_stream_encoder.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dcn10/dcn10_link_encoder.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dml/display_mode_lib.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dml/display_rq_dlg_helpers.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dml1_display_rq_dlg_calc.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dml_common_defs.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dml/display_mode_vba.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn20/display_rq_dlg_calc_20.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn20/display_mode_vba_20.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn20/display_rq_dlg_calc_20v2.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn20/display_mode_vba_20v2.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn21/display_rq_dlg_calc_21.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn21/display_mode_vba_21.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dcn21/dcn21_init.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dcn21/dcn21_hubbub.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dcn21/dcn21_hubp.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dcn21/dcn21_resource.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dcn21/dcn21_hwseq.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dcn21/dcn21_link_encoder.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dce120/dce120_resource.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dce120/dce120_timing_generator.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dce120/dce120_hw_sequencer.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dce112/dce112_compressor.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dce112/dce112_hw_sequencer.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dce112/dce112_resource.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_timing_generator.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_compressor.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_hw_sequencer.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_resource.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_opp_regamma_v.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_opp_csc_v.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_timing_generator_v.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_mem_input_v.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_opp_v.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dce110/dce110_transform_v.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dce100/dce100_resource.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dce100/dce100_hw_sequencer.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dce80/dce80_timing_generator.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dce80/dce80_hw_sequencer.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dce80/dce80_resource.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_link.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_resource.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_hw_sequencer.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_sink.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_surface.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_link_hwss.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_link_dp.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_link_ddc.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_debug.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_stream.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_vm_helper.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dc_helper.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dc/dc_dmub_srv.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/modules/freesync/freesync.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/modules/color/color_gamma.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/modules/info_packet/info_packet.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/modules/power/power_helpers.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dmub/src/dmub_srv.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dmub/src/dmub_reg.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dmub/src/dmub_dcn20.o
CC [M] drivers/gpu/drm/amd/amdgpu/../display/dmub/src/dmub_dcn21.o
LD [M] drivers/gpu/drm/amd/amdgpu/amdgpu.o
scripts/Makefile.build:503: recipe for target 'drivers/gpu/drm' failed
make[2]: *** [drivers/gpu/drm] Error 2
scripts/Makefile.build:503: recipe for target 'drivers/gpu' failed
make[1]: *** [drivers/gpu] Error 2
Makefile:1693: recipe for target 'drivers' failed
make: *** [drivers] Error 2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-02-13 22:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-01-15 15:49 [PATCH i-g-t] tools/Android.mk: Add zlib support Morton, Derek J
2016-01-15 15:59 ` Damien Lespiau
2020-02-13 22:50 ` [Intel-gfx] ✗ Fi.CI.BAT: failure for " Patchwork
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).