Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/gtest: host-gtest install like a normal cmake package
@ 2020-12-16 17:44 Paul Soucy
  2020-12-30 14:43 ` Thomas Petazzoni
  2022-01-09 21:00 ` Yann E. MORIN
  0 siblings, 2 replies; 4+ messages in thread
From: Paul Soucy @ 2020-12-16 17:44 UTC (permalink / raw)
  To: buildroot

host-gtest does not actually build and install gtest libraries or header files, it just installs the gmock_gen stuff. This patch will now build and install gtest to the host like a normal cmake package.

Signed-off-by: Paul Soucy <paul.soucy@sense.com>
---
 package/gtest/gtest.mk | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk
index 7f967b8bfb..f35ae63383 100644
--- a/package/gtest/gtest.mk
+++ b/package/gtest/gtest.mk
@@ -88,14 +88,15 @@ else
 GTEST_CONF_OPTS += -DBUILD_GMOCK=OFF
 endif
 
-define HOST_GTEST_INSTALL_CMDS
+define HOST_GTEST_POST_INSTALL_PYTHON
 	$(INSTALL) -D -m 0755 $(@D)/googlemock/scripts/generator/gmock_gen.py \
 		$(HOST_DIR)/bin/gmock_gen
 	cp -rp $(@D)/googlemock/scripts/generator/cpp \
 		$(HOST_GTEST_GMOCK_PYTHONPATH)
 endef
 
+HOST_GTEST_POST_INSTALL_HOOKS += HOST_GTEST_POST_INSTALL_PYTHON
+
+
 $(eval $(cmake-package))
-# The host package does not build anything, just installs gmock_gen stuff, so
-# it does not need to be a host-cmake-package.
-$(eval $(host-generic-package))
+$(eval $(host-cmake-package))
-- 
2.24.1 (Apple Git-126)

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [Buildroot] [PATCH 1/1] package/gtest: host-gtest install like a normal cmake package
  2020-12-16 17:44 [Buildroot] [PATCH 1/1] package/gtest: host-gtest install like a normal cmake package Paul Soucy
@ 2020-12-30 14:43 ` Thomas Petazzoni
  2020-12-30 15:13   ` Paul Soucy
  2022-01-09 21:00 ` Yann E. MORIN
  1 sibling, 1 reply; 4+ messages in thread
From: Thomas Petazzoni @ 2020-12-30 14:43 UTC (permalink / raw)
  To: buildroot

Hello Paul,

On Wed, 16 Dec 2020 12:44:04 -0500
Paul Soucy <paul.soucy@sense.com> wrote:

> host-gtest does not actually build and install gtest libraries or header files, it just installs the gmock_gen stuff. This patch will now build and install gtest to the host like a normal cmake package.
> 
> Signed-off-by: Paul Soucy <paul.soucy@sense.com>

Thanks for your patch!

Could you give some details as to why you need gtest to be installed in
$(HOST_DIR) ?

> -define HOST_GTEST_INSTALL_CMDS
> +define HOST_GTEST_POST_INSTALL_PYTHON
>  	$(INSTALL) -D -m 0755 $(@D)/googlemock/scripts/generator/gmock_gen.py \
>  		$(HOST_DIR)/bin/gmock_gen
>  	cp -rp $(@D)/googlemock/scripts/generator/cpp \
>  		$(HOST_GTEST_GMOCK_PYTHONPATH)
>  endef
>  
> +HOST_GTEST_POST_INSTALL_HOOKS += HOST_GTEST_POST_INSTALL_PYTHON

Is this thing still needed? I applied your patch, and I was able to
successfully build the target gtest+gmock, even without gmock_gen being
installed in $(HOST_DIR)/bin/ by host-gtest.

Am I missing something?

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [Buildroot] [PATCH 1/1] package/gtest: host-gtest install like a normal cmake package
  2020-12-30 14:43 ` Thomas Petazzoni
@ 2020-12-30 15:13   ` Paul Soucy
  0 siblings, 0 replies; 4+ messages in thread
From: Paul Soucy @ 2020-12-30 15:13 UTC (permalink / raw)
  To: buildroot

Hi Thomas,

Thanks for taking the time to look at the patch. The reason I would like
the option to install gtest to HOST_DIR is for running unit tests. Some of
our test suite needs to run on the HOST system. This patch solves the
problem.

I'm not sure if HOST_GTEST_POST_INSTALL_PYTHON thing is still needed. We do
not actually use the gmock feature of gtest. I was trying to preserve
existing functionality but not quite sure what the original intention of
this was.


On Wed, Dec 30, 2020, 9:44 AM Thomas Petazzoni <thomas.petazzoni@bootlin.com>
wrote:

> Hello Paul,
>
> On Wed, 16 Dec 2020 12:44:04 -0500
> Paul Soucy <paul.soucy@sense.com> wrote:
>
> > host-gtest does not actually build and install gtest libraries or header
> files, it just installs the gmock_gen stuff. This patch will now build and
> install gtest to the host like a normal cmake package.
> >
> > Signed-off-by: Paul Soucy <paul.soucy@sense.com>
>
> Thanks for your patch!
>
> Could you give some details as to why you need gtest to be installed in
> $(HOST_DIR) ?
>
> > -define HOST_GTEST_INSTALL_CMDS
> > +define HOST_GTEST_POST_INSTALL_PYTHON
> >       $(INSTALL) -D -m 0755
> $(@D)/googlemock/scripts/generator/gmock_gen.py \
> >               $(HOST_DIR)/bin/gmock_gen
> >       cp -rp $(@D)/googlemock/scripts/generator/cpp \
> >               $(HOST_GTEST_GMOCK_PYTHONPATH)
> >  endef
> >
> > +HOST_GTEST_POST_INSTALL_HOOKS += HOST_GTEST_POST_INSTALL_PYTHON
>
> Is this thing still needed? I applied your patch, and I was able to
> successfully build the target gtest+gmock, even without gmock_gen being
> installed in $(HOST_DIR)/bin/ by host-gtest.
>
> Am I missing something?
>
> Best regards,
>
> Thomas
> --
> Thomas Petazzoni, CTO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20201230/a92f3b03/attachment.html>

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [Buildroot] [PATCH 1/1] package/gtest: host-gtest install like a normal cmake package
  2020-12-16 17:44 [Buildroot] [PATCH 1/1] package/gtest: host-gtest install like a normal cmake package Paul Soucy
  2020-12-30 14:43 ` Thomas Petazzoni
@ 2022-01-09 21:00 ` Yann E. MORIN
  1 sibling, 0 replies; 4+ messages in thread
From: Yann E. MORIN @ 2022-01-09 21:00 UTC (permalink / raw)
  To: Paul Soucy; +Cc: Stephan Hoffmann, buildroot

Paul, All,

Sorry for the long delay...

On 2020-12-16 12:44 -0500, Paul Soucy spake thusly:
> host-gtest does not actually build and install gtest libraries or header files, it just installs the gmock_gen stuff. This patch will now build and install gtest to the host like a normal cmake package.

I rewrapped the commit log, and slightly extended it with the
information you rpovided elsewhere in the thread.

> Signed-off-by: Paul Soucy <paul.soucy@sense.com>
> ---
>  package/gtest/gtest.mk | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk
> index 7f967b8bfb..f35ae63383 100644
> --- a/package/gtest/gtest.mk
> +++ b/package/gtest/gtest.mk
> @@ -88,14 +88,15 @@ else
>  GTEST_CONF_OPTS += -DBUILD_GMOCK=OFF
>  endif
>  
> -define HOST_GTEST_INSTALL_CMDS
> +define HOST_GTEST_POST_INSTALL_PYTHON
>  	$(INSTALL) -D -m 0755 $(@D)/googlemock/scripts/generator/gmock_gen.py \
>  		$(HOST_DIR)/bin/gmock_gen
>  	cp -rp $(@D)/googlemock/scripts/generator/cpp \
>  		$(HOST_GTEST_GMOCK_PYTHONPATH)
>  endef
>  
> +HOST_GTEST_POST_INSTALL_HOOKS += HOST_GTEST_POST_INSTALL_PYTHON
> +
> +

    $ make check-package
    package/gtest/gtest.mk:64: consecutive empty lines

Applied to master with the above fixed, thanks.

Regards,
Yann E. MORIN.

>  $(eval $(cmake-package))
> -# The host package does not build anything, just installs gmock_gen stuff, so
> -# it does not need to be a host-cmake-package.
> -$(eval $(host-generic-package))
> +$(eval $(host-cmake-package))

-- 
.-----------------.--------------------.------------------.--------------------.
|  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

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2022-01-09 21:00 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-16 17:44 [Buildroot] [PATCH 1/1] package/gtest: host-gtest install like a normal cmake package Paul Soucy
2020-12-30 14:43 ` Thomas Petazzoni
2020-12-30 15:13   ` Paul Soucy
2022-01-09 21:00 ` Yann E. MORIN

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox