From f6dad10d0474cc80228636d6deb45b6025583566 Mon Sep 17 00:00:00 2001 From: Jose Fonseca Date: Tue, 10 Mar 2020 17:26:35 +0000 Subject: [PATCH] meson: Avoid duplicate symbols. All the stubs in src/compiler/glsl/glcpp/pp_standalone_scaffolding.c are duplicate symbols. They should only be used as replacement for Mesa functions when building glcpp and glsl standalone compilers, but in fact they are getting linked with Mesa. This change fixes this by moving the standalone stubs to a libglcpp_standalone target, that's only linked with the glcpp/glsl tools. Reviewed-by: Dylan Baker Reviewed-by: Neha Bhende Tested-by: Marge Bot Part-of: --- src/compiler/glsl/glcpp/meson.build | 15 ++++++++++++--- src/compiler/glsl/meson.build | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/compiler/glsl/glcpp/meson.build b/src/compiler/glsl/glcpp/meson.build index 5f3d85735af..81c8d65dca1 100644 --- a/src/compiler/glsl/glcpp/meson.build +++ b/src/compiler/glsl/glcpp/meson.build @@ -47,8 +47,7 @@ endif libglcpp = static_library( 'glcpp', - [glcpp_lex, glcpp_parse, files('glcpp.h', 'pp.c', - 'pp_standalone_scaffolding.c')], + [glcpp_lex, glcpp_parse, files('glcpp.h', 'pp.c')], dependencies : idep_mesautil, include_directories : [inc_common], c_args : [c_vis_args, no_override_init_args, c_msvc_compat_args, _extra_args], @@ -56,12 +55,22 @@ libglcpp = static_library( build_by_default : false, ) +libglcpp_standalone = static_library( + 'glcpp_standalone', + 'pp_standalone_scaffolding.c', + link_with : libglcpp, + include_directories : [inc_common], + c_args : [c_vis_args, no_override_init_args, c_msvc_compat_args, _extra_args], + cpp_args : [cpp_vis_args, cpp_msvc_compat_args, _extra_args], + build_by_default : false, +) + glcpp = executable( 'glcpp', 'glcpp.c', dependencies : [dep_m, idep_getopt], include_directories : [inc_common], - link_with : [libglcpp, libglsl_util], + link_with : [libglcpp_standalone, libglsl_util], c_args : [c_vis_args, no_override_init_args, c_msvc_compat_args], build_by_default : false, ) diff --git a/src/compiler/glsl/meson.build b/src/compiler/glsl/meson.build index ea3e7beaa0c..3f03d27511d 100644 --- a/src/compiler/glsl/meson.build +++ b/src/compiler/glsl/meson.build @@ -240,7 +240,7 @@ libglsl_standalone = static_library( c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args], cpp_args : [cpp_vis_args, cpp_msvc_compat_args], include_directories : [inc_common], - link_with : [libglsl, libglsl_util], + link_with : [libglsl, libglsl_util, libglcpp_standalone], dependencies : [idep_mesautil, idep_getopt], build_by_default : false, ) -- 2.30.2