[dpdk-stable] [PATCH v2] compat: merge compat library into EAL

[Bruce Richardson]

On Thu, Jan 10, 2019 at 02:57:41PM +0100, David Marchand wrote:
>    On Thu, Jan 10, 2019 at 2:48 PM Bruce Richardson
>    <[1]bruce.richardson at intel.com> wrote:
> 
>      Since compat library is only a single header, we can easily move it
>      into
>      the EAL common headers instead of tracking it separately. The
>      downside of
>      this is that it becomes a little more difficult to have any libs
>      that are
>      built before EAL depend on it. Thankfully, this is not a major
>      problem as
>      the only library which uses rte_compat.h and is built before EAL
>      (kvargs)
>      already has the path to the compat.h header file explicitly called
>      out as
>      an include path.
>      However, to ensure that we don't later hit problems later with this,
>      we can
>      add EAL common headers folder to the global include list in the
>      meson build
>      which means that all common headers can be safely used by all
>      libraries, no
>      matter what their build order.
>      As a side-effect, this patch also fixes an issue with building on
>      BSD using
>      meson, due to compat lib no longer needing to be listed as a
>      dependency.
> 
>    CC stable.
> 

Not needed. Defect introduced in a commit earlier in this release.

>      Fixes: a8499f65a1d1 ("log: add missing experimental tag")
>      Signed-off-by: Bruce Richardson <[2]bruce.richardson at intel.com>
>      ---
>      V2: Clean up a few missed references to the compat library in our
>          documentation and MAINTAINERS file.
>          Added in fixes tag, as this patch should also fix build issues
>          with BSD.
>      ---
>       MAINTAINERS                                         |  1 -
>       doc/api/[3]doxy-api.conf.in                            |  1 -
>       doc/guides/contributing/documentation.rst           |  1 -
>       doc/guides/contributing/versioning.rst              |  2 +-
>       lib/Makefile                                        |  2 --
>       lib/librte_cmdline/meson.build                      |  1 -
>       lib/librte_compat/Makefile                          | 13
>      -------------
>       lib/librte_compat/meson.build                       |  8 --------
>       lib/librte_eal/common/Makefile                      |  2 +-
>       .../common/include}/rte_compat.h                    |  0
>       lib/librte_eal/common/meson.build                   |  1 +
>       lib/librte_eal/linuxapp/eal/meson.build             |  2 +-
>       lib/librte_eal/meson.build                          |  1 -
>       lib/librte_kvargs/meson.build                       |  3 ---
>       lib/meson.build                                     |  2 +-
>       meson.build                                         |  2 +-
>       16 files changed, 6 insertions(+), 36 deletions(-)
>       delete mode 100644 lib/librte_compat/Makefile
>       delete mode 100644 lib/librte_compat/meson.build
>       rename lib/{librte_compat =>
>      librte_eal/common/include}/rte_compat.h (100%)
>      diff --git a/MAINTAINERS b/MAINTAINERS
>      index 470f36b9c..4dbb111a0 100644
>      --- a/MAINTAINERS
>      +++ b/MAINTAINERS
>      @@ -121,7 +121,6 @@ F: buildtools/symlink-drivers-solibs.sh
>       ABI versioning
>       M: Neil Horman <[4]nhorman at tuxdriver.com>
>      -F: lib/librte_compat/
> 
>    Maybe ?
>    +F: lib/librte_eal/common/include/rte_compat.h
>    Tested-by: David Marchand <[5]david.marchand at redhat.com>
>    Reviewed-by: David Marchand <[6]david.marchand at redhat.com>
>    --

CC: Neil
Not sure. I was thinking it would be covered just as part of the EAL
generally, but I'm ok if Neil still wants explicit ownership of the file.
If it is to be added, hopefully that could just be done on apply.

/Bruce