build: add module definition files for Windows
authorAnand Rawat <anand.rawat@intel.com>
Tue, 2 Apr 2019 03:54:53 +0000 (20:54 -0700)
committerThomas Monjalon <thomas@monjalon.net>
Tue, 2 Apr 2019 23:21:31 +0000 (01:21 +0200)
Updated lib/meson.build to create shared libraries on Windows.
Added DEF files to list the exports for the eal and kvargs libraries.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Signed-off-by: Anand Rawat <anand.rawat@intel.com>
Reviewed-by: Pallavi Kadam <pallavi.kadam@intel.com>
Reviewed-by: Ranjit Menon <ranjit.menon@intel.com>
Acked-by: Harini Ramakrishnan <harini.ramakrishnan@microsoft.com>
MAINTAINERS
lib/librte_eal/rte_eal_exports.def [new file with mode: 0644]
lib/librte_kvargs/rte_kvargs_exports.def [new file with mode: 0644]
lib/meson.build

index 2d50853..2547d5b 100644 (file)
@@ -290,6 +290,7 @@ M: Anand Rawat <anand.rawat@intel.com>
 M: Ranjit Menon <ranjit.menon@intel.com>
 F: kernel/windows/
 F: lib/librte_eal/windows/
+F: lib/librte_eal/rte_eal_exports.def
 
 
 Core Libraries
diff --git a/lib/librte_eal/rte_eal_exports.def b/lib/librte_eal/rte_eal_exports.def
new file mode 100644 (file)
index 0000000..12a6c79
--- /dev/null
@@ -0,0 +1,9 @@
+EXPORTS
+       __rte_panic
+       rte_eal_get_configuration
+       rte_eal_init
+       rte_eal_mp_remote_launch
+       rte_eal_mp_wait_lcore
+       rte_eal_remote_launch
+       rte_log
+       rte_vlog
diff --git a/lib/librte_kvargs/rte_kvargs_exports.def b/lib/librte_kvargs/rte_kvargs_exports.def
new file mode 100644 (file)
index 0000000..10e839e
--- /dev/null
@@ -0,0 +1,7 @@
+EXPORTS
+       rte_kvargs_count
+       rte_kvargs_free
+       rte_kvargs_parse
+       rte_kvargs_process
+       rte_kvargs_parse_delim
+       rte_kvargs_strcmp
index 99957ba..a7b5a91 100644 (file)
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
+# Copyright(c) 2017-2019 Intel Corporation
 
 
 # process all libraries equally, as far as possible
@@ -117,14 +117,23 @@ 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)
+                       exports = []
+                       implib = dir_name + '.dll.a'
+                       if host_machine.system() == '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]
+                       else
+                               lk_args = ['-Wl,--version-script=' + version_map]
+                       endif
                        shared_lib = shared_library(libname,
                                        sources,
                                        objects: objs,
                                        c_args: cflags,
                                        dependencies: shared_deps,
                                        include_directories: includes,
-                                       link_args: '-Wl,--version-script=' + version_map,
-                                       link_depends: version_map,
+                                       link_args: lk_args,
+                                       link_depends: [version_map, exports],
                                        version: lib_version,
                                        soversion: so_version,
                                        install: true)