From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E193DA0548; Thu, 1 Apr 2021 13:50:51 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BB5DE1410C7; Thu, 1 Apr 2021 13:50:31 +0200 (CEST) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mails.dpdk.org (Postfix) with ESMTP id 38F6F1410DB for ; Thu, 1 Apr 2021 13:50:29 +0200 (CEST) IronPort-SDR: kQXPJLXJNx23ZATvyU8udwZlNmt4fZ6k8Gx9JllUCbGzPWqlN4hBS+rDtaAtXZ0vrtvTnbAzdy khIO7JJQMCxg== X-IronPort-AV: E=McAfee;i="6000,8403,9940"; a="179760780" X-IronPort-AV: E=Sophos;i="5.81,296,1610438400"; d="scan'208";a="179760780" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2021 04:50:27 -0700 IronPort-SDR: sqLM53ypArf4MD97hbRjmjpPHBJkTzbIUTqHwkc6LHB6PWQUkwegSjzuWwB5oaY0bfaCZ5elyk pPI50qLxPt0A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,296,1610438400"; d="scan'208";a="446062624" Received: from silpixa00399126.ir.intel.com ([10.237.223.116]) by FMSMGA003.fm.intel.com with ESMTP; 01 Apr 2021 04:50:26 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: thomas@monjalon.net, david.marchand@redhat.com, bluca@debian.org, Bruce Richardson Date: Thu, 1 Apr 2021 12:49:59 +0100 Message-Id: <20210401115009.1063844-5-bruce.richardson@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210401115009.1063844-1-bruce.richardson@intel.com> References: <20210401115009.1063844-1-bruce.richardson@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [RFC PATCH 04/14] build: simplify the driver build configuration file X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" As with the library meson.build file, we can use the "continue" keyword to reduce the level of indentation used for the majority of the build file. Since we are changing the whitespace indentation level, we also update the body of the foreach loop to use the meson standard, 4-space indentation. Signed-off-by: Bruce Richardson --- drivers/meson.build | 361 ++++++++++++++++++++++---------------------- 1 file changed, 177 insertions(+), 184 deletions(-) diff --git a/drivers/meson.build b/drivers/meson.build index 9c8eded697..57b15bda03 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -31,188 +31,181 @@ if cc.has_argument('-Wno-format-truncation') endif foreach subpath:subdirs - drivers = [] - std_deps = [] - - # subpath can be either "class" or "class/driver" - if subpath.contains('/') - driver_path = subpath.split('/') - class = driver_path[0] - drivers += driver_path[1] - else - class = subpath - subdir(class) - endif - - # save class name on first occurrence - if not dpdk_driver_classes.contains(class) - dpdk_driver_classes += class - endif - # get already enabled drivers of the same class - enabled_drivers = get_variable(class + '_drivers', []) - - foreach drv:drivers - drv_path = join_paths(class, drv) - - # set up empty variables used for build - build = true # set to false to disable, e.g. missing deps - reason = '' # set if build == false to explain - name = drv - sources = [] - headers = [] - objs = [] - cflags = default_cflags - includes = [include_directories(drv_path)] - # set up internal deps. Drivers can append/override as necessary - deps = std_deps - # ext_deps: Stores external library dependency got - # using dependency() (preferred) or find_library(). - # For the find_library() case (but not with dependency()) we also - # need to specify the "-l" flags in pkgconfig_extra_libs variable - # too, so that it can be reflected in the pkgconfig output for - # static builds. - ext_deps = [] - pkgconfig_extra_libs = [] - - if disabled_drivers.contains(drv_path) - build = false - reason = 'explicitly disabled via build config' - else - # pull in driver directory which should update all the local variables - subdir(drv_path) - endif - - if build - # get dependency objs from strings - shared_deps = ext_deps - static_deps = ext_deps - foreach d:deps - if not is_variable('shared_rte_' + d) - build = false - reason = 'missing internal dependency, "@0@"'.format(d) - message('Disabling @1@ [@2@]: missing internal dependency "@0@"' - .format(d, name, 'drivers/' + drv_path)) - else - shared_deps += [get_variable('shared_rte_' + d)] - static_deps += [get_variable('static_rte_' + d)] - endif - endforeach - endif - - if not build - # some driver directories are placeholders which - # are never built, so we allow suppression of the - # component disable printout in those cases - if reason != '' - dpdk_drvs_disabled += drv_path - set_variable(drv_path.underscorify() + - '_disable_reason', reason) - endif - else - enabled_drivers += name - lib_name = '_'.join(['rte', class, name]) - dpdk_conf.set(lib_name.to_upper(), 1) - - dpdk_extra_ldflags += pkgconfig_extra_libs - - install_headers(headers) - - # generate pmdinfo sources by building a temporary - # lib and then running pmdinfogen on the contents of - # that lib. The final lib reuses the object files and - # adds in the new source file. - out_filename = lib_name + '.pmd.c' - tmp_lib = static_library('tmp_' + lib_name, - sources, - include_directories: includes, - dependencies: static_deps, - c_args: cflags) - objs += tmp_lib.extract_all_objects() - sources = custom_target(out_filename, - command: [pmdinfo, tmp_lib.full_path(), - '@OUTPUT@', pmdinfogen], - output: out_filename, - depends: [tmp_lib]) - - # now build the static driver - static_lib = static_library(lib_name, - sources, - objects: objs, - include_directories: includes, - dependencies: static_deps, - c_args: cflags, - install: true) - - # now build the shared driver - version_map = '@0@/@1@/version.map'.format( - meson.current_source_dir(), - drv_path) - implib = 'lib' + lib_name + '.dll.a' - - def_file = custom_target(lib_name + '_def', - command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'], - input: version_map, - output: '@0@_exports.def'.format(lib_name)) - - mingw_map = custom_target(lib_name + '_mingw', - command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'], - input: version_map, - output: '@0@_mingw.map'.format(lib_name)) - - lk_deps = [version_map, def_file, mingw_map] - if is_windows - if is_ms_linker - lk_args = ['-Wl,/def:' + def_file.full_path()] - if meson.version().version_compare('<0.54.0') - lk_args += ['-Wl,/implib:drivers\\' + implib] - endif - else - lk_args = ['-Wl,--version-script=' + mingw_map.full_path()] - endif - else - lk_args = ['-Wl,--version-script=' + version_map] - # on unix systems check the output of the - # check-symbols.sh script, using it as a - # dependency of the .so build - lk_deps += custom_target(lib_name + '.sym_chk', - command: [check_symbols, - version_map, '@INPUT@'], - capture: true, - input: static_lib, - output: lib_name + '.sym_chk') - endif - - shared_lib = shared_library(lib_name, - sources, - objects: objs, - include_directories: includes, - dependencies: shared_deps, - c_args: cflags, - link_args: lk_args, - link_depends: lk_deps, - version: abi_version, - soversion: so_version, - install: true, - install_dir: driver_install_path) - - # create a dependency object and add it to the global dictionary so - # testpmd or other built-in apps can find it if necessary - shared_dep = declare_dependency(link_with: shared_lib, - include_directories: includes, - dependencies: shared_deps) - static_dep = declare_dependency( - include_directories: includes, - dependencies: static_deps) - - dpdk_drivers += static_lib - - set_variable('shared_@0@'.format(lib_name), shared_dep) - set_variable('static_@0@'.format(lib_name), static_dep) - dependency_name = ''.join(lib_name.split('rte_')) - message('drivers/@0@: Defining dependency "@1@"'.format( - drv_path, dependency_name)) - endif # build - endforeach - - set_variable(class + '_drivers', enabled_drivers) + drivers = [] + std_deps = [] + + # subpath can be either "class" or "class/driver" + if subpath.contains('/') + driver_path = subpath.split('/') + class = driver_path[0] + drivers += driver_path[1] + else + class = subpath + subdir(class) + endif + + # save class name on first occurrence + if not dpdk_driver_classes.contains(class) + dpdk_driver_classes += class + endif + # get already enabled drivers of the same class + enabled_drivers = get_variable(class + '_drivers', []) + + foreach drv:drivers + drv_path = join_paths(class, drv) + + # set up empty variables used for build + build = true # set to false to disable, e.g. missing deps + reason = '' # set if build == false to explain + name = drv + sources = [] + headers = [] + objs = [] + cflags = default_cflags + includes = [include_directories(drv_path)] + # set up internal deps. Drivers can append/override as necessary + deps = std_deps + # ext_deps: Stores external library dependency got + # using dependency() (preferred) or find_library(). + # For the find_library() case (but not with dependency()) we also + # need to specify the "-l" flags in pkgconfig_extra_libs variable + # too, so that it can be reflected in the pkgconfig output for + # static builds. + ext_deps = [] + pkgconfig_extra_libs = [] + + if disabled_drivers.contains(drv_path) + build = false + reason = 'explicitly disabled via build config' + else + # pull in driver directory which should update all the local variables + subdir(drv_path) + endif + + if build + # get dependency objs from strings + shared_deps = ext_deps + static_deps = ext_deps + foreach d:deps + if not is_variable('shared_rte_' + d) + build = false + reason = 'missing internal dependency, "@0@"'.format(d) + message('Disabling @1@ [@2@]: missing internal dependency "@0@"' + .format(d, name, 'drivers/' + drv_path)) + else + shared_deps += [get_variable('shared_rte_' + d)] + static_deps += [get_variable('static_rte_' + d)] + endif + endforeach + endif + + if not build + # some driver directories are placeholders which + # are never built, so we allow suppression of the + # component disable printout in those cases + if reason != '' + dpdk_drvs_disabled += drv_path + set_variable(drv_path.underscorify() + '_disable_reason', reason) + endif + continue + endif + + enabled_drivers += name + lib_name = '_'.join(['rte', class, name]) + dpdk_conf.set(lib_name.to_upper(), 1) + + dpdk_extra_ldflags += pkgconfig_extra_libs + + install_headers(headers) + + # generate pmdinfo sources by building a temporary + # lib and then running pmdinfogen on the contents of + # that lib. The final lib reuses the object files and + # adds in the new source file. + out_filename = lib_name + '.pmd.c' + tmp_lib = static_library('tmp_' + lib_name, sources, + include_directories: includes, + dependencies: static_deps, + c_args: cflags) + objs += tmp_lib.extract_all_objects() + sources = custom_target(out_filename, + command: [pmdinfo, tmp_lib.full_path(), '@OUTPUT@', pmdinfogen], + output: out_filename, + depends: [tmp_lib]) + + # now build the static driver + static_lib = static_library(lib_name, + sources, + objects: objs, + include_directories: includes, + dependencies: static_deps, + c_args: cflags, + install: true) + + # now build the shared driver + version_map = '@0@/@1@/version.map'.format(meson.current_source_dir(), drv_path) + implib = 'lib' + lib_name + '.dll.a' + + def_file = custom_target(lib_name + '_def', + command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'], + input: version_map, + output: '@0@_exports.def'.format(lib_name)) + + mingw_map = custom_target(lib_name + '_mingw', + command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'], + input: version_map, + output: '@0@_mingw.map'.format(lib_name)) + + lk_deps = [version_map, def_file, mingw_map] + if is_windows + if is_ms_linker + lk_args = ['-Wl,/def:' + def_file.full_path()] + if meson.version().version_compare('<0.54.0') + lk_args += ['-Wl,/implib:drivers\\' + implib] + endif + else + lk_args = ['-Wl,--version-script=' + mingw_map.full_path()] + endif + else + lk_args = ['-Wl,--version-script=' + version_map] + # on unix systems check the output of the + # check-symbols.sh script, using it as a + # dependency of the .so build + lk_deps += custom_target(lib_name + '.sym_chk', + command: [check_symbols, version_map, '@INPUT@'], + capture: true, + input: static_lib, + output: lib_name + '.sym_chk') + endif + + shared_lib = shared_library(lib_name, sources, + objects: objs, + include_directories: includes, + dependencies: shared_deps, + c_args: cflags, + link_args: lk_args, + link_depends: lk_deps, + version: abi_version, + soversion: so_version, + install: true, + install_dir: driver_install_path) + + # create a dependency object and add it to the global dictionary so + # testpmd or other built-in apps can find it if necessary + shared_dep = declare_dependency(link_with: shared_lib, + include_directories: includes, + dependencies: shared_deps) + static_dep = declare_dependency( + include_directories: includes, + dependencies: static_deps) + + dpdk_drivers += static_lib + + set_variable('shared_@0@'.format(lib_name), shared_dep) + set_variable('static_@0@'.format(lib_name), static_dep) + dependency_name = ''.join(lib_name.split('rte_')) + message('drivers/@0@: Defining dependency "@1@"'.format(drv_path, dependency_name)) + endforeach + + set_variable(class + '_drivers', enabled_drivers) endforeach -- 2.27.0