From f55d1f806e6b6c33af559de166d08ec8fa3ebe90 Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Sun, 1 Apr 2018 20:49:35 -0400 Subject: radeonsi: try to fix meson This is not fully tested. Meson can't link LLVM even though automake can. PATH=/usr/llvm/x86_64-linux-gnu/bin:$PATH meson build/ -Dgallium-va=false \ -Dplatforms=x11,drm -Dgallium-drivers=radeonsi -Ddri-drivers= \ -Dgallium-omx=disabled -Dgallium-xvmc=false -Dgles1=false \ -Dtexture-float=true -Dvulkan-drivers= src/gallium/auxiliary/libgallium.a(gallivm_lp_bld_misc.cpp.o): (.data.rel.ro._ZTI26DelegatingJITMemoryManager[_ZTI26DelegatingJITMemoryManager]+0x10): undefined reference to `typeinfo for llvm::RTDyldMemoryManager' Acked-by: Timothy Arceri --- src/gallium/drivers/radeon/meson.build | 59 ---------------------------------- 1 file changed, 59 deletions(-) delete mode 100644 src/gallium/drivers/radeon/meson.build (limited to 'src/gallium/drivers/radeon') diff --git a/src/gallium/drivers/radeon/meson.build b/src/gallium/drivers/radeon/meson.build deleted file mode 100644 index 582a5ff5e21..00000000000 --- a/src/gallium/drivers/radeon/meson.build +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright © 2017 Dylan Baker - -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: - -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. - -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. - -files_libradeon = files( - 'r600_buffer_common.c', - 'r600_cs.h', - 'r600_gpu_load.c', - 'r600_perfcounter.c', - 'r600_pipe_common.c', - 'r600_pipe_common.h', - 'r600_query.c', - 'r600_query.h', - 'r600_texture.c', - 'radeon_uvd.c', - 'radeon_uvd.h', - 'radeon_vcn_enc_1_2.c', - 'radeon_vcn_enc.c', - 'radeon_vcn_enc.h', - 'radeon_vcn_dec.c', - 'radeon_vcn_dec.h', - 'radeon_uvd_enc_1_1.c', - 'radeon_uvd_enc.c', - 'radeon_uvd_enc.h', - 'radeon_vce_40_2_2.c', - 'radeon_vce_50.c', - 'radeon_vce_52.c', - 'radeon_vce.c', - 'radeon_vce.h', - 'radeon_video.c', - 'radeon_video.h', - 'radeon_winsys.h', -) - -libradeon = static_library( - 'radeon', - files_libradeon, - c_args : ['-Wstrict-overflow=0', c_vis_args], - dependencies : [dep_llvm, dep_clock], - include_directories : [ - inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_gallium_drivers, inc_amd_common, - ], -) -- cgit v1.2.3