2017-12-18 15:56:25 +00:00
|
|
|
# SPDX-License-Identifier: BSD-3-Clause
|
|
|
|
# Copyright(c) 2017 Intel Corporation
|
2017-11-17 19:37:54 +00:00
|
|
|
|
2017-10-17 12:43:57 +00:00
|
|
|
|
|
|
|
# process all libraries equally, as far as possible
|
|
|
|
# "core" libs first, then others alphebetically as far as possible
|
|
|
|
# NOTE: for speed of meson runs, the dependencies in the subdirectories
|
|
|
|
# sometimes skip deps that would be implied by others, e.g. if mempool is
|
|
|
|
# given as a dep, no need to mention ring. This is especially true for the
|
|
|
|
# core libs which are widely reused, so their deps are kept to a minimum.
|
build: remove library special cases
The EAL and compat libraries were special-cases in the library build
process, the former because of it's complexity, and the latter because
it only consists of a single header file.
By reworking the EAL meson.build files, we can eliminate the need for it to
be a special case, by having it build up and return the list of sources,
headers, and objects and return those to the higher level build file. This
should also simplify the building of EAL, as we can eliminate a number of
meson.build files that would no longer be needed, and have fewer, but
larger meson.build files (9 now vs 14 previous) - thereby making the logic
easier to follow and items easier to find.
Once done, we can pull eal into the main library loop, with some
modifications to support it. Compat can also be pulled it once we add in a
check to handle the case of an empty sources list.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Luca Boccassi <bluca@debian.org>
2017-11-03 14:47:43 +00:00
|
|
|
libraries = [ 'compat', # just a header, used for versioning
|
|
|
|
'eal', 'ring', 'mempool', 'mbuf', 'net', 'ether', 'pci', # core
|
2017-10-17 12:43:57 +00:00
|
|
|
'metrics', # bitrate/latency stats depends on this
|
|
|
|
'hash', # efd depends on this
|
|
|
|
'kvargs', # cryptodev depends on this
|
|
|
|
'acl', 'bbdev', 'bitratestats', 'cfgfile',
|
|
|
|
'cmdline', 'cryptodev',
|
|
|
|
'distributor', 'efd', 'eventdev',
|
|
|
|
'gro', 'gso', 'ip_frag', 'jobstats',
|
|
|
|
'kni', 'latencystats', 'lpm', 'member',
|
|
|
|
'meter', 'power', 'pdump',
|
|
|
|
'reorder', 'sched', 'security', 'timer', 'vhost',
|
|
|
|
# add pkt framework libs which use other libs from above
|
|
|
|
'port', 'table', 'pipeline',
|
|
|
|
# flow_classify lib depends on pkt framework table lib
|
|
|
|
'flow_classify']
|
|
|
|
|
|
|
|
foreach l:libraries
|
|
|
|
build = true
|
|
|
|
name = l
|
|
|
|
version = 1
|
|
|
|
allow_experimental_apis = false
|
|
|
|
sources = []
|
|
|
|
headers = []
|
build: remove library special cases
The EAL and compat libraries were special-cases in the library build
process, the former because of it's complexity, and the latter because
it only consists of a single header file.
By reworking the EAL meson.build files, we can eliminate the need for it to
be a special case, by having it build up and return the list of sources,
headers, and objects and return those to the higher level build file. This
should also simplify the building of EAL, as we can eliminate a number of
meson.build files that would no longer be needed, and have fewer, but
larger meson.build files (9 now vs 14 previous) - thereby making the logic
easier to follow and items easier to find.
Once done, we can pull eal into the main library loop, with some
modifications to support it. Compat can also be pulled it once we add in a
check to handle the case of an empty sources list.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Luca Boccassi <bluca@debian.org>
2017-11-03 14:47:43 +00:00
|
|
|
includes = []
|
2018-01-22 15:26:30 +00:00
|
|
|
cflags = machine_args
|
build: remove library special cases
The EAL and compat libraries were special-cases in the library build
process, the former because of it's complexity, and the latter because
it only consists of a single header file.
By reworking the EAL meson.build files, we can eliminate the need for it to
be a special case, by having it build up and return the list of sources,
headers, and objects and return those to the higher level build file. This
should also simplify the building of EAL, as we can eliminate a number of
meson.build files that would no longer be needed, and have fewer, but
larger meson.build files (9 now vs 14 previous) - thereby making the logic
easier to follow and items easier to find.
Once done, we can pull eal into the main library loop, with some
modifications to support it. Compat can also be pulled it once we add in a
check to handle the case of an empty sources list.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Luca Boccassi <bluca@debian.org>
2017-11-03 14:47:43 +00:00
|
|
|
objs = [] # other object files to link against, used e.g. for
|
|
|
|
# instruction-set optimized versions of code
|
|
|
|
|
2017-10-17 12:43:57 +00:00
|
|
|
# use "deps" for internal DPDK dependencies, and "ext_deps" for
|
|
|
|
# external package/library requirements
|
|
|
|
ext_deps = []
|
build: remove library special cases
The EAL and compat libraries were special-cases in the library build
process, the former because of it's complexity, and the latter because
it only consists of a single header file.
By reworking the EAL meson.build files, we can eliminate the need for it to
be a special case, by having it build up and return the list of sources,
headers, and objects and return those to the higher level build file. This
should also simplify the building of EAL, as we can eliminate a number of
meson.build files that would no longer be needed, and have fewer, but
larger meson.build files (9 now vs 14 previous) - thereby making the logic
easier to follow and items easier to find.
Once done, we can pull eal into the main library loop, with some
modifications to support it. Compat can also be pulled it once we add in a
check to handle the case of an empty sources list.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Luca Boccassi <bluca@debian.org>
2017-11-03 14:47:43 +00:00
|
|
|
deps = ['eal'] # eal is standard dependency except for itself
|
|
|
|
if l == 'eal'
|
|
|
|
deps = []
|
|
|
|
endif
|
2017-10-17 12:43:57 +00:00
|
|
|
|
|
|
|
dir_name = 'librte_' + l
|
|
|
|
subdir(dir_name)
|
|
|
|
|
|
|
|
if build
|
|
|
|
dpdk_conf.set('RTE_LIBRTE_' + name.to_upper(), 1)
|
|
|
|
install_headers(headers)
|
|
|
|
|
build: remove library special cases
The EAL and compat libraries were special-cases in the library build
process, the former because of it's complexity, and the latter because
it only consists of a single header file.
By reworking the EAL meson.build files, we can eliminate the need for it to
be a special case, by having it build up and return the list of sources,
headers, and objects and return those to the higher level build file. This
should also simplify the building of EAL, as we can eliminate a number of
meson.build files that would no longer be needed, and have fewer, but
larger meson.build files (9 now vs 14 previous) - thereby making the logic
easier to follow and items easier to find.
Once done, we can pull eal into the main library loop, with some
modifications to support it. Compat can also be pulled it once we add in a
check to handle the case of an empty sources list.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Luca Boccassi <bluca@debian.org>
2017-11-03 14:47:43 +00:00
|
|
|
libname = 'rte_' + name
|
|
|
|
includes += include_directories(dir_name)
|
2017-10-17 12:43:57 +00:00
|
|
|
|
build: remove library special cases
The EAL and compat libraries were special-cases in the library build
process, the former because of it's complexity, and the latter because
it only consists of a single header file.
By reworking the EAL meson.build files, we can eliminate the need for it to
be a special case, by having it build up and return the list of sources,
headers, and objects and return those to the higher level build file. This
should also simplify the building of EAL, as we can eliminate a number of
meson.build files that would no longer be needed, and have fewer, but
larger meson.build files (9 now vs 14 previous) - thereby making the logic
easier to follow and items easier to find.
Once done, we can pull eal into the main library loop, with some
modifications to support it. Compat can also be pulled it once we add in a
check to handle the case of an empty sources list.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Luca Boccassi <bluca@debian.org>
2017-11-03 14:47:43 +00:00
|
|
|
if sources.length() == 0
|
|
|
|
# if no C files, just set a dependency on header path
|
2017-11-03 17:27:32 +00:00
|
|
|
shared_dep = declare_dependency(include_directories: includes)
|
|
|
|
static_dep = shared_dep
|
2017-08-31 10:36:43 +00:00
|
|
|
else
|
2017-11-03 17:27:32 +00:00
|
|
|
shared_deps = ext_deps
|
|
|
|
static_deps = ext_deps
|
build: remove library special cases
The EAL and compat libraries were special-cases in the library build
process, the former because of it's complexity, and the latter because
it only consists of a single header file.
By reworking the EAL meson.build files, we can eliminate the need for it to
be a special case, by having it build up and return the list of sources,
headers, and objects and return those to the higher level build file. This
should also simplify the building of EAL, as we can eliminate a number of
meson.build files that would no longer be needed, and have fewer, but
larger meson.build files (9 now vs 14 previous) - thereby making the logic
easier to follow and items easier to find.
Once done, we can pull eal into the main library loop, with some
modifications to support it. Compat can also be pulled it once we add in a
check to handle the case of an empty sources list.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Luca Boccassi <bluca@debian.org>
2017-11-03 14:47:43 +00:00
|
|
|
foreach d:deps
|
2017-11-03 17:27:32 +00:00
|
|
|
shared_deps += [get_variable('shared_rte_' + d)]
|
|
|
|
static_deps += [get_variable('static_rte_' + d)]
|
build: remove library special cases
The EAL and compat libraries were special-cases in the library build
process, the former because of it's complexity, and the latter because
it only consists of a single header file.
By reworking the EAL meson.build files, we can eliminate the need for it to
be a special case, by having it build up and return the list of sources,
headers, and objects and return those to the higher level build file. This
should also simplify the building of EAL, as we can eliminate a number of
meson.build files that would no longer be needed, and have fewer, but
larger meson.build files (9 now vs 14 previous) - thereby making the logic
easier to follow and items easier to find.
Once done, we can pull eal into the main library loop, with some
modifications to support it. Compat can also be pulled it once we add in a
check to handle the case of an empty sources list.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Luca Boccassi <bluca@debian.org>
2017-11-03 14:47:43 +00:00
|
|
|
endforeach
|
2017-08-31 10:36:43 +00:00
|
|
|
|
build: remove library special cases
The EAL and compat libraries were special-cases in the library build
process, the former because of it's complexity, and the latter because
it only consists of a single header file.
By reworking the EAL meson.build files, we can eliminate the need for it to
be a special case, by having it build up and return the list of sources,
headers, and objects and return those to the higher level build file. This
should also simplify the building of EAL, as we can eliminate a number of
meson.build files that would no longer be needed, and have fewer, but
larger meson.build files (9 now vs 14 previous) - thereby making the logic
easier to follow and items easier to find.
Once done, we can pull eal into the main library loop, with some
modifications to support it. Compat can also be pulled it once we add in a
check to handle the case of an empty sources list.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Luca Boccassi <bluca@debian.org>
2017-11-03 14:47:43 +00:00
|
|
|
if allow_experimental_apis
|
|
|
|
cflags += '-DALLOW_EXPERIMENTAL_API'
|
|
|
|
endif
|
2017-10-17 12:43:57 +00:00
|
|
|
|
build: remove library special cases
The EAL and compat libraries were special-cases in the library build
process, the former because of it's complexity, and the latter because
it only consists of a single header file.
By reworking the EAL meson.build files, we can eliminate the need for it to
be a special case, by having it build up and return the list of sources,
headers, and objects and return those to the higher level build file. This
should also simplify the building of EAL, as we can eliminate a number of
meson.build files that would no longer be needed, and have fewer, but
larger meson.build files (9 now vs 14 previous) - thereby making the logic
easier to follow and items easier to find.
Once done, we can pull eal into the main library loop, with some
modifications to support it. Compat can also be pulled it once we add in a
check to handle the case of an empty sources list.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Luca Boccassi <bluca@debian.org>
2017-11-03 14:47:43 +00:00
|
|
|
if get_option('per_library_versions')
|
|
|
|
lib_version = '@0@.1'.format(version)
|
|
|
|
so_version = '@0@'.format(version)
|
|
|
|
else
|
|
|
|
prj_ver = meson.project_version().split('.')
|
|
|
|
lib_version = '@0@.@1@'.format(
|
|
|
|
prj_ver.get(0), prj_ver.get(1))
|
|
|
|
so_version = lib_version
|
|
|
|
endif
|
|
|
|
|
2017-11-03 17:27:32 +00:00
|
|
|
# first build static lib
|
|
|
|
static_lib = static_library(libname,
|
|
|
|
sources,
|
|
|
|
objects: objs,
|
|
|
|
c_args: cflags,
|
|
|
|
dependencies: static_deps,
|
|
|
|
include_directories: includes,
|
|
|
|
install: true)
|
|
|
|
static_dep = declare_dependency(link_with: static_lib,
|
|
|
|
include_directories: includes,
|
|
|
|
dependencies: static_deps)
|
|
|
|
|
|
|
|
# then use pre-build objects to build shared lib
|
|
|
|
sources = []
|
|
|
|
objs += static_lib.extract_all_objects()
|
build: remove library special cases
The EAL and compat libraries were special-cases in the library build
process, the former because of it's complexity, and the latter because
it only consists of a single header file.
By reworking the EAL meson.build files, we can eliminate the need for it to
be a special case, by having it build up and return the list of sources,
headers, and objects and return those to the higher level build file. This
should also simplify the building of EAL, as we can eliminate a number of
meson.build files that would no longer be needed, and have fewer, but
larger meson.build files (9 now vs 14 previous) - thereby making the logic
easier to follow and items easier to find.
Once done, we can pull eal into the main library loop, with some
modifications to support it. Compat can also be pulled it once we add in a
check to handle the case of an empty sources list.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Luca Boccassi <bluca@debian.org>
2017-11-03 14:47:43 +00:00
|
|
|
version_map = '@0@/@1@/rte_@2@_version.map'.format(
|
|
|
|
meson.current_source_dir(), dir_name, name)
|
2017-11-03 17:27:32 +00:00
|
|
|
shared_lib = shared_library(libname,
|
build: remove library special cases
The EAL and compat libraries were special-cases in the library build
process, the former because of it's complexity, and the latter because
it only consists of a single header file.
By reworking the EAL meson.build files, we can eliminate the need for it to
be a special case, by having it build up and return the list of sources,
headers, and objects and return those to the higher level build file. This
should also simplify the building of EAL, as we can eliminate a number of
meson.build files that would no longer be needed, and have fewer, but
larger meson.build files (9 now vs 14 previous) - thereby making the logic
easier to follow and items easier to find.
Once done, we can pull eal into the main library loop, with some
modifications to support it. Compat can also be pulled it once we add in a
check to handle the case of an empty sources list.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Luca Boccassi <bluca@debian.org>
2017-11-03 14:47:43 +00:00
|
|
|
sources,
|
|
|
|
objects: objs,
|
|
|
|
c_args: cflags,
|
2017-11-03 17:27:32 +00:00
|
|
|
dependencies: shared_deps,
|
build: remove library special cases
The EAL and compat libraries were special-cases in the library build
process, the former because of it's complexity, and the latter because
it only consists of a single header file.
By reworking the EAL meson.build files, we can eliminate the need for it to
be a special case, by having it build up and return the list of sources,
headers, and objects and return those to the higher level build file. This
should also simplify the building of EAL, as we can eliminate a number of
meson.build files that would no longer be needed, and have fewer, but
larger meson.build files (9 now vs 14 previous) - thereby making the logic
easier to follow and items easier to find.
Once done, we can pull eal into the main library loop, with some
modifications to support it. Compat can also be pulled it once we add in a
check to handle the case of an empty sources list.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Luca Boccassi <bluca@debian.org>
2017-11-03 14:47:43 +00:00
|
|
|
include_directories: includes,
|
|
|
|
link_args: '-Wl,--version-script=' + version_map,
|
|
|
|
link_depends: version_map,
|
|
|
|
version: lib_version,
|
|
|
|
soversion: so_version,
|
|
|
|
install: true)
|
2017-11-03 17:27:32 +00:00
|
|
|
shared_dep = declare_dependency(link_with: shared_lib,
|
build: remove library special cases
The EAL and compat libraries were special-cases in the library build
process, the former because of it's complexity, and the latter because
it only consists of a single header file.
By reworking the EAL meson.build files, we can eliminate the need for it to
be a special case, by having it build up and return the list of sources,
headers, and objects and return those to the higher level build file. This
should also simplify the building of EAL, as we can eliminate a number of
meson.build files that would no longer be needed, and have fewer, but
larger meson.build files (9 now vs 14 previous) - thereby making the logic
easier to follow and items easier to find.
Once done, we can pull eal into the main library loop, with some
modifications to support it. Compat can also be pulled it once we add in a
check to handle the case of an empty sources list.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Luca Boccassi <bluca@debian.org>
2017-11-03 14:47:43 +00:00
|
|
|
include_directories: includes,
|
2017-11-03 17:27:32 +00:00
|
|
|
dependencies: shared_deps)
|
build: remove library special cases
The EAL and compat libraries were special-cases in the library build
process, the former because of it's complexity, and the latter because
it only consists of a single header file.
By reworking the EAL meson.build files, we can eliminate the need for it to
be a special case, by having it build up and return the list of sources,
headers, and objects and return those to the higher level build file. This
should also simplify the building of EAL, as we can eliminate a number of
meson.build files that would no longer be needed, and have fewer, but
larger meson.build files (9 now vs 14 previous) - thereby making the logic
easier to follow and items easier to find.
Once done, we can pull eal into the main library loop, with some
modifications to support it. Compat can also be pulled it once we add in a
check to handle the case of an empty sources list.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Luca Boccassi <bluca@debian.org>
2017-11-03 14:47:43 +00:00
|
|
|
|
2017-11-03 17:27:32 +00:00
|
|
|
dpdk_libraries = [shared_lib] + dpdk_libraries
|
build: remove library special cases
The EAL and compat libraries were special-cases in the library build
process, the former because of it's complexity, and the latter because
it only consists of a single header file.
By reworking the EAL meson.build files, we can eliminate the need for it to
be a special case, by having it build up and return the list of sources,
headers, and objects and return those to the higher level build file. This
should also simplify the building of EAL, as we can eliminate a number of
meson.build files that would no longer be needed, and have fewer, but
larger meson.build files (9 now vs 14 previous) - thereby making the logic
easier to follow and items easier to find.
Once done, we can pull eal into the main library loop, with some
modifications to support it. Compat can also be pulled it once we add in a
check to handle the case of an empty sources list.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Luca Boccassi <bluca@debian.org>
2017-11-03 14:47:43 +00:00
|
|
|
endif # sources.length() > 0
|
|
|
|
|
2017-11-03 17:27:32 +00:00
|
|
|
set_variable('shared_' + libname, shared_dep)
|
|
|
|
set_variable('static_' + libname, static_dep)
|
build: remove library special cases
The EAL and compat libraries were special-cases in the library build
process, the former because of it's complexity, and the latter because
it only consists of a single header file.
By reworking the EAL meson.build files, we can eliminate the need for it to
be a special case, by having it build up and return the list of sources,
headers, and objects and return those to the higher level build file. This
should also simplify the building of EAL, as we can eliminate a number of
meson.build files that would no longer be needed, and have fewer, but
larger meson.build files (9 now vs 14 previous) - thereby making the logic
easier to follow and items easier to find.
Once done, we can pull eal into the main library loop, with some
modifications to support it. Compat can also be pulled it once we add in a
check to handle the case of an empty sources list.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Luca Boccassi <bluca@debian.org>
2017-11-03 14:47:43 +00:00
|
|
|
endif # if build
|
2017-10-17 12:43:57 +00:00
|
|
|
endforeach
|