Re: [OSS-Tools] [PATCH platsch V5 2/5] convert to meson build

[Philipp Zabel <p.zabel@pengutronix.de>]

Hi,

On Mi, 2024-06-19 at 12:22 +0200, LI Qingwu wrote:
> Convert to meson build and update the README.rst
> version update to 2024.06.0
> cleanup .gitignore
> 
> Signed-off-by: LI Qingwu <Qing-wu.Li@leica-geosystems.com.cn>
> ---
>  .gitignore   | 14 --------------
>  Makefile.am  | 23 -----------------------
>  README.rst   |  8 ++++++++
>  configure.ac | 13 -------------
>  meson.build  | 14 ++++++++++++++
>  5 files changed, 22 insertions(+), 50 deletions(-)
>  delete mode 100644 Makefile.am
>  delete mode 100644 configure.ac
>  create mode 100644 meson.build
> 
> diff --git a/.gitignore b/.gitignore
> index bef7e68..e69de29 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -1,14 +0,0 @@
> -/*.o
> -/aclocal.m4
> -/autom4te.cache
> -/compile
> -/config.log
> -/config.status
> -/configure
> -/depcomp
> -/.deps
> -/install-sh
> -/Makefile
> -/Makefile.in
> -/missing
> -/platsch
> diff --git a/Makefile.am b/Makefile.am
> deleted file mode 100644
> index d149ae0..0000000
> --- a/Makefile.am
> +++ /dev/null
> @@ -1,23 +0,0 @@
> -EXTRA_DIST = README.rst LICENSE
> -
> -sbin_PROGRAMS = platsch
> -
> -platsch_SOURCES = platsch.c
> -platsch_CFLAGS = $(LIBDRM_CFLAGS)
> -platsch_LDADD = $(LIBDRM_LIBS)
> -
> -CLEANFILES = \
> -        $(DIST_ARCHIVES)
> -
> -DISTCLEAN = \
> -        config.log \
> -        config.status \
> -        Makefile
> -
> -MAINTAINERCLEANFILES = \
> -	aclocal.m4 \
> -	configure \
> -	depcomp \
> -	install-sh \
> -	Makefile.in \
> -	missing
> diff --git a/README.rst b/README.rst
> index e318120..f1c0812 100644
> --- a/README.rst
> +++ b/README.rst
> @@ -141,3 +141,11 @@ By adding a Signed-off-by line (e.g. using ``git commit -s``) saying::
>  
>  (using your real name and e-mail address), you state that your contributions
>  are in line with the DCO.
> +
> +Compiling Instructions
> +----------------------------
> +
> +.. code-block:: shell
> +
> +    meson setup build
> +    meson compile -C build
> diff --git a/configure.ac b/configure.ac
> deleted file mode 100644
> index 18878db..0000000
> --- a/configure.ac
> +++ /dev/null
> @@ -1,13 +0,0 @@
> -AC_PREREQ([2.69])
> -AC_INIT([platsch], [2019.12.0], [oss-tools@pengutronix.de])
> -AC_CONFIG_SRCDIR([platsch.c])
> -AM_INIT_AUTOMAKE([foreign dist-xz])
> -
> -AC_PROG_CC
> -AC_PROG_MAKE_SET
> -
> -PKG_CHECK_MODULES([LIBDRM], [libdrm >= 2.4.112])
> -
> -AC_CONFIG_FILES([Makefile])
> -
> -AC_OUTPUT
> diff --git a/meson.build b/meson.build
> new file mode 100644
> index 0000000..b732a06
> --- /dev/null
> +++ b/meson.build
> @@ -0,0 +1,14 @@
> +project('platsch', 'c', version: '2024.06.0', license : '0BSD')
> +
> +dep_libdrm = dependency('libdrm',
> +    version: '>= 2.4.112',
> +    static: true
> +)
> +
> +executable('platsch',
> +    'platsch.c',
> +    dependencies: dep_libdrm,
> +    link_args: '-static',

Dynamic linking should be kept working in case the build environment
does not provide static libraries. I think we could gate static linking
behind the --prefer-static Meson option, like this:

dep_libdrm = dependency('libdrm', version: '>= 2.4.112')

platsch_link_args = []

if get_option('prefer_static')
  cc = meson.get_compiler('c')
  if cc.find_library('drm', static: true, required: false).found()
    platsch_link_args += '-static'
  endif
endif

executable('platsch',
  'platsch.c',
  dependencies: dep_libdrm,
  link_args: platsch_link_args,
  install: true,
  install_dir: 'sbin',
)

Another option would be to drop static linking for now and only add it
in a separate patch later.

> +    install: true,
> +    install_dir : 'sbin'

Please pick a formatting style and apply it consistently, e.g. remove
the space before all colons, or add it everywhere.

Apart from the static linking issue, this looks good to me now.

regards
Philipp