* [Buildroot] [PATCH 1/1] package/gtest: drop host-gtest
@ 2022-07-12 20:31 Fabrice Fontaine
2022-07-17 13:57 ` Yann E. MORIN
2022-08-10 12:20 ` Peter Korsgaard
0 siblings, 2 replies; 3+ messages in thread
From: Fabrice Fontaine @ 2022-07-12 20:31 UTC (permalink / raw)
To: buildroot; +Cc: Stephan Hoffmann, Fabrice Fontaine
Drop host-gtest to avoid the following build failure raised since bump
to version 1.12.0 in commit a336b731af5979a25213b33c5840de6d1ed88bdc and
https://github.com/google/googletest/commit/6202251f0963187a7781f181365cf8c19bf343d5:
/usr/bin/install -D -m 0755 /home/giuliobenetti/autobuild/run/instance-1/output-1/build/host-gtest-1.12.0/googlemock/scripts/generator/gmock_gen.py /home/giuliobenetti/autobuild/run/instance-1/output-1/host/bin/gmock_gen
/usr/bin/install: cannot stat '/home/giuliobenetti/autobuild/run/instance-1/output-1/build/host-gtest-1.12.0/googlemock/scripts/generator/gmock_gen.py': No such file or directory
Fixes:
- http://autobuild.buildroot.org/results/6a8fb259760f84c67a3482cc5964c6610f9b70a4
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/gtest/Config.in | 9 ---------
package/gtest/gtest.mk | 15 ---------------
2 files changed, 24 deletions(-)
diff --git a/package/gtest/Config.in b/package/gtest/Config.in
index 4355e9c9c5..4591cb5e48 100644
--- a/package/gtest/Config.in
+++ b/package/gtest/Config.in
@@ -26,7 +26,6 @@ if BR2_PACKAGE_GTEST
config BR2_PACKAGE_GTEST_GMOCK
bool "gmock"
- depends on BR2_HOST_GCC_AT_LEAST_5 # host-gtest
help
Inspired by jMock, EasyMock, and Hamcrest, and designed with
C++'s specifics in mind, Google C++ Mocking Framework (or
@@ -43,14 +42,6 @@ config BR2_PACKAGE_GTEST_GMOCK
* works on Linux, Mac OS X, Windows, Windows Mobile, minGW,
and Symbian.
- There are both host and target packages. The target one has
- include files required to compile the tests and the static
- libraries required to link/run them. The host package installs
- gmock_gen, a Python script used to generate code mocks.
-
-comment "gmock needs host gcc >= 5"
- depends on !BR2_HOST_GCC_AT_LEAST_5
-
endif # BR2_PACKAGE_GTEST
comment "gtest needs a toolchain w/ C++, wchar, threads, gcc >= 5"
diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk
index 8ec5e9c535..a9ac49957b 100644
--- a/package/gtest/gtest.mk
+++ b/package/gtest/gtest.mk
@@ -13,10 +13,6 @@ GTEST_LICENSE_FILES = LICENSE
GTEST_CPE_ID_VENDOR = google
GTEST_CPE_ID_PRODUCT = google_test
-HOST_GTEST_LICENSE = Apache-2.0
-HOST_GTEST_LICENSE_FILES = googlemock/scripts/generator/LICENSE
-HOST_GTEST_DEPENDENCIES = host-python3
-
# While it is possible to build gtest as shared library, using this gtest shared
# library requires to set some special configure option in the project using
# gtest.
@@ -34,20 +30,9 @@ GTEST_CONF_OPTS += -DCMAKE_POSITION_INDEPENDENT_CODE=ON
endif
ifeq ($(BR2_PACKAGE_GTEST_GMOCK),y)
-GTEST_DEPENDENCIES += host-gtest
GTEST_CONF_OPTS += -DBUILD_GMOCK=ON
else
GTEST_CONF_OPTS += -DBUILD_GMOCK=OFF
endif
-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_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages
-endef
-
-HOST_GTEST_POST_INSTALL_HOOKS += HOST_GTEST_POST_INSTALL_PYTHON
-
$(eval $(cmake-package))
-$(eval $(host-cmake-package))
--
2.35.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/gtest: drop host-gtest
2022-07-12 20:31 [Buildroot] [PATCH 1/1] package/gtest: drop host-gtest Fabrice Fontaine
@ 2022-07-17 13:57 ` Yann E. MORIN
2022-08-10 12:20 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Yann E. MORIN @ 2022-07-17 13:57 UTC (permalink / raw)
To: Fabrice Fontaine; +Cc: Stephan Hoffmann, buildroot
Fabrice, All,
On 2022-07-12 22:31 +0200, Fabrice Fontaine spake thusly:
> Drop host-gtest to avoid the following build failure raised since bump
> to version 1.12.0 in commit a336b731af5979a25213b33c5840de6d1ed88bdc and
> https://github.com/google/googletest/commit/6202251f0963187a7781f181365cf8c19bf343d5:
>
> /usr/bin/install -D -m 0755 /home/giuliobenetti/autobuild/run/instance-1/output-1/build/host-gtest-1.12.0/googlemock/scripts/generator/gmock_gen.py /home/giuliobenetti/autobuild/run/instance-1/output-1/host/bin/gmock_gen
> /usr/bin/install: cannot stat '/home/giuliobenetti/autobuild/run/instance-1/output-1/build/host-gtest-1.12.0/googlemock/scripts/generator/gmock_gen.py': No such file or directory
>
> Fixes:
> - http://autobuild.buildroot.org/results/6a8fb259760f84c67a3482cc5964c6610f9b70a4
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> package/gtest/Config.in | 9 ---------
> package/gtest/gtest.mk | 15 ---------------
> 2 files changed, 24 deletions(-)
>
> diff --git a/package/gtest/Config.in b/package/gtest/Config.in
> index 4355e9c9c5..4591cb5e48 100644
> --- a/package/gtest/Config.in
> +++ b/package/gtest/Config.in
> @@ -26,7 +26,6 @@ if BR2_PACKAGE_GTEST
>
> config BR2_PACKAGE_GTEST_GMOCK
> bool "gmock"
> - depends on BR2_HOST_GCC_AT_LEAST_5 # host-gtest
> help
> Inspired by jMock, EasyMock, and Hamcrest, and designed with
> C++'s specifics in mind, Google C++ Mocking Framework (or
> @@ -43,14 +42,6 @@ config BR2_PACKAGE_GTEST_GMOCK
> * works on Linux, Mac OS X, Windows, Windows Mobile, minGW,
> and Symbian.
>
> - There are both host and target packages. The target one has
> - include files required to compile the tests and the static
> - libraries required to link/run them. The host package installs
> - gmock_gen, a Python script used to generate code mocks.
> -
> -comment "gmock needs host gcc >= 5"
> - depends on !BR2_HOST_GCC_AT_LEAST_5
> -
> endif # BR2_PACKAGE_GTEST
>
> comment "gtest needs a toolchain w/ C++, wchar, threads, gcc >= 5"
> diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk
> index 8ec5e9c535..a9ac49957b 100644
> --- a/package/gtest/gtest.mk
> +++ b/package/gtest/gtest.mk
> @@ -13,10 +13,6 @@ GTEST_LICENSE_FILES = LICENSE
> GTEST_CPE_ID_VENDOR = google
> GTEST_CPE_ID_PRODUCT = google_test
>
> -HOST_GTEST_LICENSE = Apache-2.0
> -HOST_GTEST_LICENSE_FILES = googlemock/scripts/generator/LICENSE
> -HOST_GTEST_DEPENDENCIES = host-python3
> -
> # While it is possible to build gtest as shared library, using this gtest shared
> # library requires to set some special configure option in the project using
> # gtest.
> @@ -34,20 +30,9 @@ GTEST_CONF_OPTS += -DCMAKE_POSITION_INDEPENDENT_CODE=ON
> endif
>
> ifeq ($(BR2_PACKAGE_GTEST_GMOCK),y)
> -GTEST_DEPENDENCIES += host-gtest
> GTEST_CONF_OPTS += -DBUILD_GMOCK=ON
> else
> GTEST_CONF_OPTS += -DBUILD_GMOCK=OFF
> endif
>
> -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_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages
> -endef
> -
> -HOST_GTEST_POST_INSTALL_HOOKS += HOST_GTEST_POST_INSTALL_PYTHON
> -
> $(eval $(cmake-package))
> -$(eval $(host-cmake-package))
> --
> 2.35.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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/gtest: drop host-gtest
2022-07-12 20:31 [Buildroot] [PATCH 1/1] package/gtest: drop host-gtest Fabrice Fontaine
2022-07-17 13:57 ` Yann E. MORIN
@ 2022-08-10 12:20 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2022-08-10 12:20 UTC (permalink / raw)
To: Fabrice Fontaine; +Cc: Stephan Hoffmann, buildroot
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
> Drop host-gtest to avoid the following build failure raised since bump
> to version 1.12.0 in commit a336b731af5979a25213b33c5840de6d1ed88bdc and
> https://github.com/google/googletest/commit/6202251f0963187a7781f181365cf8c19bf343d5:
> /usr/bin/install -D -m 0755
> /home/giuliobenetti/autobuild/run/instance-1/output-1/build/host-gtest-1.12.0/googlemock/scripts/generator/gmock_gen.py
> /home/giuliobenetti/autobuild/run/instance-1/output-1/host/bin/gmock_gen
> /usr/bin/install: cannot stat
> '/home/giuliobenetti/autobuild/run/instance-1/output-1/build/host-gtest-1.12.0/googlemock/scripts/generator/gmock_gen.py':
> No such file or directory
> Fixes:
> - http://autobuild.buildroot.org/results/6a8fb259760f84c67a3482cc5964c6610f9b70a4
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Hmm, does this mean that host-gmock isn't built anymore or does the
target package now build it?
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-08-10 12:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-12 20:31 [Buildroot] [PATCH 1/1] package/gtest: drop host-gtest Fabrice Fontaine
2022-07-17 13:57 ` Yann E. MORIN
2022-08-10 12:20 ` Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.