From 6297eeaa46bdfe60992c81ff7a7acf1e50c2d3f1 Mon Sep 17 00:00:00 2001 From: Jami Kettunen Date: Sun, 5 Jun 2022 02:48:41 +0300 Subject: [PATCH] common: unset CMAKE_GENERATOR before sourcing templates When building dependencies of packages this has to be unset to avoid using e.g. CMAKE_GENERATOR="Unix Makefiles" for a package which expected to build with the default of make_cmd=ninja, and would subsequently fail with "ninja: error: loading 'build.ninja': No such file or directory" during do_build() if do_configure() generated a Makefile instead of a build.ninja file. --- common/environment/setup/sourcepkg.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/common/environment/setup/sourcepkg.sh b/common/environment/setup/sourcepkg.sh index e0e16d7915cb..3a9bcdacb872 100644 --- a/common/environment/setup/sourcepkg.sh +++ b/common/environment/setup/sourcepkg.sh @@ -18,6 +18,7 @@ unset -v reverts subpackages makedepends hostmakedepends checkdepends depends re unset -v nopie build_options build_options_default bootstrap repository reverts unset -v CFLAGS CXXFLAGS FFLAGS CPPFLAGS LDFLAGS LD_LIBRARY_PATH unset -v CC CXX CPP GCC LD AR AS RANLIB NM OBJDUMP OBJCOPY STRIP READELF PKG_CONFIG +unset -v CMAKE_GENERATOR # hooks/do-extract/00-distfiles unset -v skip_extraction