Skip to contentSkip to conversation

package/pkg-cmake.mk: unset CMAKE_GENERATOR vars

PATCH In review Gleb Mazovetskiy 2 participants 3 messages Oct 29, 2022 – Nov 1, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/pkg-cmake.mk: unset CMAKE_GENERATOR vars

If the user environment defines CMAKE_GENERATOR (e.g. CMAKE_GENERATOR=Ninja), buildroot would previously fail to build cmake packages because buildroot uses make explicitly (as opposed to cmake --build).

Unsets all the CMAKE_GENERATOR* variables before configuring a cmake package.

---
 package/pkg-cmake.mk | 2 ++
 1 file changed, 2 insertions(+)
package/pkg-cmake.mk +2 -0
index 081960b5bf..96b2579cc5 100644
@@ -86,6 +86,7 @@ define $(2)_CONFIGURE_CMDS
 	(mkdir -p $$($$(PKG)_BUILDDIR) && \
 	cd $$($$(PKG)_BUILDDIR) && \
 	rm -f CMakeCache.txt && \
+	unset CMAKE_GENERATOR CMAKE_GENERATOR_PLATFORM CMAKE_GENERATOR_TOOLSET CMAKE_GENERATOR_INSTANCE && \
 	PATH=$$(BR_PATH) \
 	$$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \
 		-DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/share/buildroot/toolchainfile.cmake" \
@@ -111,6 +112,7 @@ define $(2)_CONFIGURE_CMDS
 	(mkdir -p $$($$(PKG)_BUILDDIR) && \
 	cd $$($$(PKG)_BUILDDIR) && \
 	rm -f CMakeCache.txt && \
+	unset CMAKE_GENERATOR CMAKE_GENERATOR_PLATFORM CMAKE_GENERATOR_TOOLSET CMAKE_GENERATOR_INSTANCE && \
 	PATH=$$(BR_PATH) \
 	PKG_CONFIG="$$(PKG_CONFIG_HOST_BINARY)" \
 	PKG_CONFIG_SYSROOT_DIR="/" \
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

Gleb, All,

On 2022-10-29 12:09 +0100, Gleb Mazovetskiy spake thusly:

Quoted 18 lines

If the user environment defines CMAKE_GENERATOR (e.g. CMAKE_GENERATOR=Ninja), buildroot would previously fail to build cmake packages because buildroot uses make explicitly (as opposed to cmake --build).

Unsets all the CMAKE_GENERATOR* variables before configuring a cmake package.

---
 package/pkg-cmake.mk | 2 ++
 1 file changed, 2 insertions(+)
package/pkg-cmake.mk +0 -0
index 081960b5bf..96b2579cc5 100644

package/pkg-cmake.mk define $(2)_CONFIGURE_CMDS · line 89

Quoted 4 lines
package/pkg-cmake.mk +1 -0
@@ -86,6 +86,7 @@ define $(2)_CONFIGURE_CMDS
 	(mkdir -p $$($$(PKG)_BUILDDIR) && \
 	cd $$($$(PKG)_BUILDDIR) && \
 	rm -f CMakeCache.txt && \
+	unset CMAKE_GENERATOR CMAKE_GENERATOR_PLATFORM CMAKE_GENERATOR_TOOLSET CMAKE_GENERATOR_INSTANCE && \

I've instead applied the patch from Woody:

    https://patchwork.ozlabs.org/project/buildroot/patch/94745932ea2dfa030e3d438d7cf6b84f1ef2f69c.camel@carnegierobotics.com/

So I dropped your patch.

In the future, we should be able to replace the hard-coded "Unix Makefiles" with a per-package setting, where package can elect building built with nother backend (or better yet, switch netirely to another backend globally), and the patch from Woody felt like slightly preparing for that future.

Regards,
Yann E. MORIN.

Quoted 18 lines
package/pkg-cmake.mk +1 -0
 	PATH=$$(BR_PATH) \
 	$$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \
 		-DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/share/buildroot/toolchainfile.cmake" \
@@ -111,6 +112,7 @@ define $(2)_CONFIGURE_CMDS
 	(mkdir -p $$($$(PKG)_BUILDDIR) && \
 	cd $$($$(PKG)_BUILDDIR) && \
 	rm -f CMakeCache.txt && \
+	unset CMAKE_GENERATOR CMAKE_GENERATOR_PLATFORM CMAKE_GENERATOR_TOOLSET CMAKE_GENERATOR_INSTANCE && \
 	PATH=$$(BR_PATH) \
 	PKG_CONFIG="$$(PKG_CONFIG_HOST_BINARY)" \
 	PKG_CONFIG_SYSROOT_DIR="/" \
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------.
|  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
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#2 lore raw

Thanks!
Can we do something similar for PERL_MM_OPT?

Buildroot currently requires the user to unset it manually but ideally it'd just unset it itself
https://github.com/buildroot/buildroot/blob/ba2659401feb5cc97cad501ab8b38268de578d3f/support/dependencies/dependencies.sh#L49-L56

Quoted 75 lines · Yann E. MORIN

Gleb, All,

On 2022-10-29 12:09 +0100, Gleb Mazovetskiy spake thusly:

Quoted 18 lines

If the user environment defines CMAKE_GENERATOR (e.g. CMAKE_GENERATOR=Ninja), buildroot would previously fail to build cmake packages because buildroot uses make explicitly (as opposed to cmake --build).

Unsets all the CMAKE_GENERATOR* variables before configuring a cmake package.

---
 package/pkg-cmake.mk | 2 ++
 1 file changed, 2 insertions(+)
package/pkg-cmake.mk +0 -0
index 081960b5bf..96b2579cc5 100644

package/pkg-cmake.mk define $(2)_CONFIGURE_CMDS · line 89

Quoted 4 lines
package/pkg-cmake.mk +1 -0
@@ -86,6 +86,7 @@ define $(2)_CONFIGURE_CMDS
      (mkdir -p $$($$(PKG)_BUILDDIR) && \
      cd $$($$(PKG)_BUILDDIR) && \
      rm -f CMakeCache.txt && \
+     unset CMAKE_GENERATOR CMAKE_GENERATOR_PLATFORM

CMAKE_GENERATOR_TOOLSET CMAKE_GENERATOR_INSTANCE && \

I've instead applied the patch from Woody:

https://patchwork.ozlabs.org/project/buildroot/patch/94745932ea2dfa030e3d438d7cf6b84f1ef2f69c.camel@carnegierobotics.com/

So I dropped your patch.

In the future, we should be able to replace the hard-coded "Unix Makefiles" with a per-package setting, where package can elect building built with nother backend (or better yet, switch netirely to another backend globally), and the patch from Woody felt like slightly preparing for that future.

Regards,
Yann E. MORIN.

package/pkg-cmake.mk define $(2)_CONFIGURE_CMDS

Quoted 3 lines
package/pkg-cmake.mk +0 -0
      PATH=$$(BR_PATH) \
      $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \
 

-DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/share/buildroot/toolchainfile.cmake" \

package/pkg-cmake.mk define $(2)_CONFIGURE_CMDS · line 115

Quoted 5 lines
package/pkg-cmake.mk +1 -0
@@ -111,6 +112,7 @@ define $(2)_CONFIGURE_CMDS
      (mkdir -p $$($$(PKG)_BUILDDIR) && \
      cd $$($$(PKG)_BUILDDIR) && \
      rm -f CMakeCache.txt && \
+     unset CMAKE_GENERATOR CMAKE_GENERATOR_PLATFORM

CMAKE_GENERATOR_TOOLSET CMAKE_GENERATOR_INSTANCE && \

Quoted 10 lines
package/pkg-cmake.mk +0 -1
      PATH=$$(BR_PATH) \
      PKG_CONFIG="$$(PKG_CONFIG_HOST_BINARY)" \
      PKG_CONFIG_SYSROOT_DIR="/" \
--

2.34.1

_______________________________________________
buildroot mailing list
[email protected]
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.  |
Quoted 2 lines

'------------------------------^-------^------------------^--------------------'

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot