git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
eal: introduce random generator with upper bound
[dpdk.git]
/
lib
/
meson.build
diff --git
a/lib/meson.build
b/lib/meson.build
index
e067ce5
..
9398a3a
100644
(file)
--- a/
lib/meson.build
+++ b/
lib/meson.build
@@
-41,9
+41,6
@@
endif
enabled_libs = [] # used to print summary at the end
enabled_libs = [] # used to print summary at the end
-# -D_GNU_SOURCE unconditionally
-default_cflags += '-D_GNU_SOURCE'
-
foreach l:libraries
build = true
name = l
foreach l:libraries
build = true
name = l
@@
-121,15
+118,19
@@
foreach l:libraries
objs += static_lib.extract_all_objects(recursive: false)
version_map = '@0@/@1@/rte_@2@_version.map'.format(
meson.current_source_dir(), dir_name, name)
objs += static_lib.extract_all_objects(recursive: false)
version_map = '@0@/@1@/rte_@2@_version.map'.format(
meson.current_source_dir(), dir_name, name)
- exports = []
implib = dir_name + '.dll.a'
implib = dir_name + '.dll.a'
+
+ def_file = custom_target(name + '_def',
+ command: [map_to_def_cmd, '@INPUT@', '@OUTPUT@'],
+ input: version_map,
+ output: 'rte_@0@_exports.def'.format(name))
if is_windows
if is_windows
- exports = '@0@/@1@/rte_@2@_exports.def'.format(
- meson.current_source_dir(), dir_name, name)
- lk_args = ['-Wl,/def:' + exports, '-Wl,/implib:lib\\' + implib]
+ lk_args = ['-Wl,/def:' + def_file.full_path(),
+ '-Wl,/implib:lib\\' + implib]
else
lk_args = ['-Wl,--version-script=' + version_map]
endif
else
lk_args = ['-Wl,--version-script=' + version_map]
endif
+
shared_lib = shared_library(libname,
sources,
objects: objs,
shared_lib = shared_library(libname,
sources,
objects: objs,
@@
-137,7
+138,7
@@
foreach l:libraries
dependencies: shared_deps,
include_directories: includes,
link_args: lk_args,
dependencies: shared_deps,
include_directories: includes,
link_args: lk_args,
- link_depends: [version_map,
exports
],
+ link_depends: [version_map,
def_file
],
version: lib_version,
soversion: so_version,
install: true)
version: lib_version,
soversion: so_version,
install: true)