X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=meson.build;h=76a14cc6061d38109e35929d2f294142ab290f0d;hb=da5fa4d4d6d1b1fd82dee4830fa5364d6ac9270f;hp=46f9c5683006f772b9f1a7445dc42e030db0b6e8;hpb=12784d9b6e2003d258958a0a986e0a48c6c3db45;p=dpdk.git diff --git a/meson.build b/meson.build index 46f9c56830..76a14cc606 100644 --- a/meson.build +++ b/meson.build @@ -31,8 +31,8 @@ global_inc = include_directories('.', 'config', subdir('config') # build libs and drivers -subdir('lib') subdir('buildtools') +subdir('lib') subdir('drivers') # build binaries and installable tools @@ -42,10 +42,9 @@ subdir('app') # build docs subdir('doc') -# build any examples explicitly requested - useful for developers -if get_option('examples') != '' - subdir('examples') -endif +# build any examples explicitly requested - useful for developers - and +# install any example code into the appropriate install path +subdir('examples') # build kernel modules if enabled if get_option('enable_kmods') @@ -64,6 +63,10 @@ configure_file(output: build_cfg, dpdk_drivers = ['-Wl,--whole-archive'] + dpdk_drivers + ['-Wl,--no-whole-archive'] pkg = import('pkgconfig') +pkg_extra_cflags = ['-include', 'rte_config.h'] + machine_args +if is_freebsd + pkg_extra_cflags += ['-D__BSD_VISIBLE'] +endif pkg.generate(name: meson.project_name(), filebase: 'lib' + meson.project_name().to_lower(), version: meson.project_version(), @@ -76,7 +79,7 @@ pkg.generate(name: meson.project_name(), Note that CFLAGS might contain an -march flag higher than typical baseline. This is required for a number of static inline functions in the public headers.''', subdirs: [get_option('include_subdir_arch'), '.'], - extra_cflags: ['-include', 'rte_config.h'] + machine_args + extra_cflags: pkg_extra_cflags ) # final output, list all the libs and drivers to be built