vcpkg/ports/dpdk/enable-either-static-or-shared-build.patch

84 lines
3.1 KiB
Diff
Raw Normal View History

diff --git a/config/meson.build b/config/meson.build
2024-08-17 08:46:52 +00:00
index 9484987..722e114 100644
--- a/config/meson.build
+++ b/config/meson.build
2024-08-17 08:46:52 +00:00
@@ -94,7 +94,9 @@ eal_pmd_path = join_paths(get_option('prefix'), driver_install_path)
# driver .so files often depend upon the bus drivers for their connect bus,
# e.g. ixgbe depends on librte_bus_pci. This means that the bus drivers need
# to be in the library path, so symlink the drivers from the main lib directory.
-if not is_windows
+if get_option('default_library') == 'static'
+ # skip
+elif not is_windows
meson.add_install_script('../buildtools/symlink-drivers-solibs.sh',
get_option('libdir'), pmd_subdir_opt)
elif meson.version().version_compare('>=0.55.0')
diff --git a/drivers/meson.build b/drivers/meson.build
2024-08-17 08:46:52 +00:00
index 66931d4..65ded2e 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
2024-08-17 08:46:52 +00:00
@@ -247,7 +247,7 @@ foreach subpath:subdirs
include_directories: includes,
dependencies: static_deps,
c_args: cflags,
- install: true)
+ install: get_option('default_library') == 'static')
# now build the shared driver
version_map = '@0@/@1@/version.map'.format(meson.current_source_dir(), drv_path)
2024-08-17 08:46:52 +00:00
@@ -295,7 +295,7 @@ foreach subpath:subdirs
else
lk_args = ['-Wl,--version-script=' + version_map]
endif
2024-08-17 08:46:52 +00:00
-
+ if get_option('default_library') == 'shared'
shared_lib = shared_library(lib_name, sources,
objects: objs,
include_directories: includes,
2024-08-17 08:46:52 +00:00
@@ -313,10 +313,13 @@ foreach subpath:subdirs
shared_dep = declare_dependency(link_with: shared_lib,
include_directories: includes,
dependencies: shared_deps)
+ endif
static_dep = declare_dependency(
include_directories: includes,
dependencies: static_deps)
2024-08-17 08:46:52 +00:00
-
+ if get_option('default_library') == 'static'
+ shared_dep = static_dep
+ endif
dpdk_drivers += static_lib
2024-08-17 08:46:52 +00:00
set_variable('shared_@0@'.format(lib_name), shared_dep)
diff --git a/lib/meson.build b/lib/meson.build
2024-08-17 08:46:52 +00:00
index 1622877..8ca5780 100644
--- a/lib/meson.build
+++ b/lib/meson.build
2024-08-17 08:46:52 +00:00
@@ -249,7 +249,7 @@ foreach l:libraries
c_args: cflags,
dependencies: static_deps,
include_directories: includes,
- install: true)
+ install: get_option('default_library') == 'static')
static_dep = declare_dependency(
include_directories: includes,
dependencies: static_deps)
2024-08-17 08:46:52 +00:00
@@ -311,6 +311,7 @@ foreach l:libraries
output: name + '.sym_chk')
endif
+ if get_option('default_library') == 'shared'
shared_lib = shared_library(libname,
sources,
objects: objs,
2024-08-17 08:46:52 +00:00
@@ -327,6 +328,9 @@ foreach l:libraries
dependencies: shared_deps)
dpdk_libraries = [shared_lib] + dpdk_libraries
+ else
+ shared_dep = static_dep
+ endif
dpdk_static_libraries = [static_lib] + dpdk_static_libraries
set_variable('shared_rte_' + name, shared_dep)