lib: enable non ARM build for libs

Enable non ARM builds for libs and apps. When the platform is not ARM, the build is treated as host build and only the libs & apps required to be run on host would be build. If the platform is ARM but the build is for host, then the new option ('enable_host_build') can be used. Signed-off-by: Anoob Joseph <[email protected]> Change-Id: I49c9f46e4aac1c4f5e418dc559e46fab6550b43b Reviewed-on: https://sj1git1.cavium.com/c/IP/SW/dataplane/dpu-offload/+/142460 Tested-by: sa_ip-toolkits-Jenkins <[email protected]> (cherry picked from commit 17176230fabdce37503f6c62e35e29c50707e182) Reviewed-on: https://sj1git1.cavium.com/c/IP/SW/dataplane/dpu-offload/+/143762 Reviewed-by: Jerin Jacob <[email protected]>
MarvellEmbeddedProcessors · Jan 22, 2025 · 841e427 · 841e427
1 parent 747e81c
commit 841e427
Show file tree

Hide file tree

Showing 16 changed files with 81 additions and 16 deletions.
diff --git a/app/ovs-offload/meson.build b/app/ovs-offload/meson.build
@@ -4,6 +4,10 @@
 # Application Sources
 sources = []
 
+if host_build
+	skip_app = true
+endif
+
 # Include directories
 includes += include_directories(['include'])
 

diff --git a/app/smart-nic/meson.build b/app/smart-nic/meson.build
@@ -4,6 +4,10 @@
 # Application Sources
 sources = []
 
+if host_build
+	skip_app = true
+endif
+
 # Include directories
 includes += include_directories(['include'])
 

diff --git a/doc/guides/gsg/build.rst b/doc/guides/gsg/build.rst
@@ -76,7 +76,9 @@ documentation will be built by default.
 
 Meson Options
 -------------
- - kernel_dir: Path to the kernel for building kernel modules (octep_vdpa).
+ - **kernel_dir**: Path to the kernel for building kernel modules (octep_vdpa).
    Headers must be in $kernel_dir.
- - dma_stats: Enable DMA statistics for DAO library
- - virtio_debug: Enable virtio debug that perform descriptor validation, etc.
+ - **dma_stats**: Enable DMA statistics for DAO library
+ - **virtio_debug**: Enable virtio debug that perform descriptor validation, etc.
+ - **enable_host_build**: Enable the host build for the DAO library. This option
+   compiles only the components necessary for the host environment.
diff --git a/lib/common/meson.build b/lib/common/meson.build
@@ -9,13 +9,19 @@ configure_file(
 	install_dir: '.'
 )
 
-sources = files(
-	'dma.c',
-	'dao_bitmap.c',
-	'dao_log.c',
-	'dao_util.c',
-	'dao_dynamic_string.c'
-)
+if host_build
+	sources = files(
+		'dao_log.c',
+	)
+else
+	sources = files(
+		'dma.c',
+		'dao_bitmap.c',
+		'dao_log.c',
+		'dao_util.c',
+		'dao_dynamic_string.c'
+	)
+endif
 
 headers = files(
 	'dao_bitmap.h',

diff --git a/lib/featurearc/meson.build b/lib/featurearc/meson.build
@@ -3,6 +3,10 @@
 
 deps += ['common']
 
+if host_build
+	skip_lib = true
+endif
+
 sources = files(
 	'feature_arc.c'
 )

diff --git a/lib/flow/meson.build b/lib/flow/meson.build
@@ -1,6 +1,10 @@
 # SPDX-License-Identifier: Marvell-MIT
 # Copyright (c) 2024 Marvell.
 
+if host_build
+	skip_lib = true
+endif
+
 sources = files(
 	'dao_flow.c',
 	'flow_acl.c',

diff --git a/lib/netlink/meson.build b/lib/netlink/meson.build
@@ -7,6 +7,10 @@ if not DAO_BUILD_CONF.has('DAO_LIBNL_DEP')
   subdir_done()
 endif
 
+if host_build
+	skip_lib = true
+endif
+
 deps += ['common']
 
 sources = files(

diff --git a/lib/pal/meson.build b/lib/pal/meson.build
@@ -1,6 +1,10 @@
 # SPDX-License-Identifier: Marvell-MIT
 # Copyright (c) 2024 Marvell.
 
+if host_build
+  skip_lib = true
+endif
+
 sources = files(
   'dao_pal.c',
 )

diff --git a/lib/pem/meson.build b/lib/pem/meson.build
@@ -1,6 +1,10 @@
 # SPDX-License-Identifier: Marvell-MIT
 # Copyright (c) 2023 Marvell.
 
+if host_build
+	skip_lib = true
+endif
+
 sources = files(
 	'pem.c',
 	'sdp.c'

diff --git a/lib/portgroup/meson.build b/lib/portgroup/meson.build
@@ -1,6 +1,10 @@
 # SPDX-License-Identifier: Marvell-MIT
 # Copyright (c) 2023 Marvell.
 
+if host_build
+	skip_lib = true
+endif
+
 deps += ['common']
 
 sources = files(

diff --git a/lib/vfio/meson.build b/lib/vfio/meson.build
@@ -1,6 +1,10 @@
 # SPDX-License-Identifier: Marvell-MIT
 # Copyright (c) 2024 Marvell.
 
+if host_build
+	skip_lib = true
+endif
+
 sources = files(
 	'dao_vfio_platform.c'
 )

diff --git a/lib/virtio/meson.build b/lib/virtio/meson.build
@@ -1,6 +1,10 @@
 # SPDX-License-Identifier: Marvell-Proprietary
 # Copyright (c) 2023 Marvell.
 
+if host_build
+	skip_lib = true
+endif
+
 sources = files(
 	'virtio_dev.c',
 	'virtio_mbox.c',

diff --git a/lib/virtio_net/meson.build b/lib/virtio_net/meson.build
@@ -1,6 +1,10 @@
 # SPDX-License-Identifier: Marvell-Proprietary
 # Copyright (c) 2023 Marvell.
 
+if host_build
+	skip_lib = true
+endif
+
 sources = files(
 	'virtio_net_deq.c',
 	'virtio_net_enq.c',

diff --git a/lib/workers/meson.build b/lib/workers/meson.build
@@ -1,6 +1,10 @@
 # SPDX-License-Identifier: Marvell-MIT
 # Copyright (c) 2023 Marvell.
 
+if host_build
+	skip_lib = true
+endif
+
 deps += ['common']
 
 sources = files(

diff --git a/meson.build b/meson.build
@@ -24,6 +24,15 @@ DAO_STATIC_LIBS = []
 DAO_MODULES_ENABLED = []
 DAO_MODULES_DISABLED = []
 
+host_build = false
+if (get_option('enable_host_build'))
+	host_build = true
+endif
+
+# If CPU is not ARM, treat as host build
+if host_machine.cpu_family() != 'aarch64'
+	host_build = true
+endif
 
 dpdk_version = run_command(find_program('cat', 'more'),
 							files('DPDK_VERSION'), check: true).stdout().strip()
@@ -33,12 +42,10 @@ subdir('dep')
 subdir('config')
 
 # Mandatory dependency
-if host_machine.cpu_family() == 'aarch64'
-	if DAO_BUILD_CONF.has('DAO_LIBDPDK_DEP')
-		subdir('lib')
-		subdir('app')
-		subdir('tests')
-	endif
+if DAO_BUILD_CONF.has('DAO_LIBDPDK_DEP')
+	subdir('lib')
+	subdir('app')
+	subdir('tests')
 endif
 
 doxygen = find_program('doxygen', required: false)

diff --git a/meson_options.txt b/meson_options.txt
@@ -11,3 +11,5 @@ option('platform', type: 'string', value: 'native', description:
        'Platform to build.')
 option('enable_kmods', type: 'boolean', value: true, description:
        'build kernel modules')
+option('enable_host_build', type: 'boolean', value: false, description:
+       'Build DAO packages required for host only.')