Re: [Buildroot] [PATCH v6 2/8] package/re2: switch to generic-package make build

["Yann E. MORIN" <yann.morin.1998@free.fr>]

Jmes, All,

On 2022-02-05 13:18 -0700, James Hilliard spake thusly:
> The cmake build appears to be missing features such as pkg-config
> generation support, switch to the regular makefile based build
> which appears to work better.

I was wondering why we could not just fix the CMake buildsystem, and
submit the fix upstream...

And then I remembered already talking about this earlier, but this
commit did not carry any explanations why we could not do it... So I
had to dig the archives to recover the previous discussion.

So, bottom line is, the commit log would be better off with more
explanations, like:

    The cmake build appears to be missing features, such as pkg-config
    generation support which is needed for some packages to find re2,
    like qt5webengine.

    Upstream is not keen on fixing the CMake-absed buildsystem [0]

    Instead of patching it on our side, and then have to carry the patch
    forever, we switch to the Makefile-based generic buildsystem.

    Note that previously some packages like grpc failed when the generic
    Makefile was used, because they would not find the cmake-equivalent
    of pkg-config, but this is now fixed [1].

    Signed-off-by: you.

    [0] https://github.com/google/re2/issues/349
    [1] https://github.com/grpc/grpc/commit/45e413d2520795e7281e9a592af81620349bc186

> This will be needed by qt5webengine.
> 
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> ---
> Changes v1 -> v2:
>   - don't built shared libraries if BR2_STATIC_LIBS is set
> ---
>  package/re2/re2.mk | 32 ++++++++++++++++++++++++++++----
>  1 file changed, 28 insertions(+), 4 deletions(-)
> 
> diff --git a/package/re2/re2.mk b/package/re2/re2.mk
> index b562d5d7ef..2863fcb662 100644
> --- a/package/re2/re2.mk
> +++ b/package/re2/re2.mk
> @@ -10,8 +10,32 @@ RE2_LICENSE = BSD-3-Clause
>  RE2_LICENSE_FILES = LICENSE
>  RE2_INSTALL_STAGING = YES
>  
> -RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF
> -HOST_RE2_CONF_OPTS += -DRE2_BUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON
> +define RE2_BUILD_CMDS
> +	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
> +		-C $(@D) $(if $(BR2_STATIC_LIBS),static)
> +endef
>  
> -$(eval $(cmake-package))
> -$(eval $(host-cmake-package))
> +define RE2_INSTALL_STAGING_CMDS
> +	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
> +		DESTDIR="$(STAGING_DIR)" prefix=/usr -C $(@D) \

We usually do not double-quote STAGING_DIR, TARGET_DIR, or HOST_DIR,
because we do not even support building in a directory with spaces in
its name.

    $ git grep -E '=\$\(STAGING_DIR\)' |wc -l
    693
    $ git grep -E '="\$\(STAGING_DIR\)"' |wc -l
    23

So I'd prefer we stick to the not-double-quoted situation.

No need to respin, this can be fixed when applying...

Regards,
Yann E. MORIN.

> +		$(if $(BR2_STATIC_LIBS),static-install,install)
> +endef
> +
> +define RE2_INSTALL_TARGET_CMDS
> +	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
> +		DESTDIR="$(TARGET_DIR)" prefix=/usr -C $(@D) \
> +		$(if $(BR2_STATIC_LIBS),static-install,install)
> +endef
> +
> +define HOST_RE2_BUILD_CMDS
> +	$(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \
> +		-C $(@D)
> +endef
> +
> +define HOST_RE2_INSTALL_CMDS
> +	$(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \
> +		-C $(@D) DESTDIR="$(HOST_DIR)" prefix=/usr install
> +endef
> +
> +$(eval $(generic-package))
> +$(eval $(host-generic-package))
> -- 
> 2.25.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot