- move cmake env/opts to pkg_cmake.mk

3 years ago · d815282968
2 changed files with 91 additions and 91 deletions
--- a/make/environment-build.mk
+++ b/make/environment-build.mk
@ -307,97 +307,6 @@ endef

 # -----------------------------------------------------------------------------

-HOST_CMAKE_ENV = \
-	$($(PKG)_CONF_ENV)
-
-HOST_CMAKE_OPTS += \
-	--no-warn-unused-cli
-
-HOST_CMAKE_OPTS += \
-	-DENABLE_STATIC=OFF \
-	-DBUILD_SHARED_LIBS=ON \
-	-DBUILD_DOC=OFF \
-	-DBUILD_DOCS=OFF \
-	-DBUILD_EXAMPLE=OFF \
-	-DBUILD_EXAMPLES=OFF \
-	-DBUILD_TEST=OFF \
-	-DBUILD_TESTS=OFF \
-	-DBUILD_TESTING=OFF \
-	-DCMAKE_COLOR_MAKEFILE=OFF \
-	-DCMAKE_INSTALL_PREFIX="$(HOST_DIR)" \
-	-DCMAKE_PREFIX_PATH="$(HOST_DIR)"
-
-HOST_CMAKE_OPTS += \
-	$($(PKG)_CONF_OPTS)
-
-TARGET_CMAKE_ENV = \
-	$($(PKG)_CONF_ENV)
-
-TARGET_CMAKE_OPTS = \
-	--no-warn-unused-cli
-
-TARGET_CMAKE_OPTS += \
-	-DENABLE_STATIC=OFF \
-	-DBUILD_SHARED_LIBS=ON \
-	-DBUILD_DOC=OFF \
-	-DBUILD_DOCS=OFF \
-	-DBUILD_EXAMPLE=OFF \
-	-DBUILD_EXAMPLES=OFF \
-	-DBUILD_TEST=OFF \
-	-DBUILD_TESTS=OFF \
-	-DBUILD_TESTING=OFF \
-	-DCMAKE_COLOR_MAKEFILE=OFF \
-	-DCMAKE_BUILD_TYPE="None" \
-	-DCMAKE_SYSTEM_NAME="Linux" \
-	-DCMAKE_SYSTEM_PROCESSOR="$(TARGET_ARCH)" \
-	-DCMAKE_INSTALL_PREFIX="$(prefix)" \
-	-DCMAKE_INSTALL_DOCDIR="$(REMOVE_docdir)" \
-	-DCMAKE_INSTALL_MANDIR="$(REMOVE_mandir)" \
-	-DCMAKE_PREFIX_PATH="$(TARGET_DIR)" \
-	-DCMAKE_INCLUDE_PATH="$(TARGET_includedir)" \
-	-DCMAKE_C_COMPILER="$(TARGET_CC)" \
-	-DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -DNDEBUG" \
-	-DCMAKE_CPP_COMPILER="$(TARGET_CPP)" \
-	-DCMAKE_CPP_FLAGS="$(TARGET_CFLAGS) -DNDEBUG" \
-	-DCMAKE_CXX_COMPILER="$(TARGET_CXX)" \
-	-DCMAKE_CXX_FLAGS="$(TARGET_CFLAGS) -DNDEBUG" \
-	-DCMAKE_LINKER="$(TARGET_LD)" \
-	-DCMAKE_AR="$(TARGET_AR)" \
-	-DCMAKE_AS="$(TARGET_AS)" \
-	-DCMAKE_NM="$(TARGET_NM)" \
-	-DCMAKE_OBJCOPY="$(TARGET_OBJCOPY)" \
-	-DCMAKE_OBJDUMP="$(TARGET_OBJDUMP)" \
-	-DCMAKE_RANLIB="$(TARGET_RANLIB)" \
-	-DCMAKE_READELF="$(TARGET_READELF)" \
-	-DCMAKE_STRIP="$(TARGET_STRIP)"
-
-TARGET_CMAKE_OPTS += \
-	$($(PKG)_CONF_OPTS)
-
-define HOST_CMAKE
-	@$(call MESSAGE,"Configuring")
-	$(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep))
-	$(Q)( \
-	$(CHDIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR); \
-		rm -f CMakeCache.txt; \
-		$(HOST_CMAKE_ENV) cmake $(HOST_CMAKE_OPTS); \
-	)
-	$(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep))
-endef
-
-define TARGET_CMAKE
-	@$(call MESSAGE,"Configuring")
-	$(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep))
-	$(Q)( \
-	$(CHDIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR); \
-		rm -f CMakeCache.txt; \
-		$(TARGET_CMAKE_ENV) cmake $(TARGET_CMAKE_OPTS); \
-	)
-	$(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep))
-endef
-
-# -----------------------------------------------------------------------------
-
 define meson-cross-config # (dest dir)
 	$(INSTALL) -d $(1)
 	( \
--- a/package/pkg-cmake.mk
+++ b/package/pkg-cmake.mk
@ -4,6 +4,61 @@
 #
 ################################################################################

+TARGET_CMAKE_ENV = \
+	$($(PKG)_CONF_ENV)
+
+TARGET_CMAKE_OPTS = \
+	--no-warn-unused-cli
+
+TARGET_CMAKE_OPTS += \
+	-DENABLE_STATIC=OFF \
+	-DBUILD_SHARED_LIBS=ON \
+	-DBUILD_DOC=OFF \
+	-DBUILD_DOCS=OFF \
+	-DBUILD_EXAMPLE=OFF \
+	-DBUILD_EXAMPLES=OFF \
+	-DBUILD_TEST=OFF \
+	-DBUILD_TESTS=OFF \
+	-DBUILD_TESTING=OFF \
+	-DCMAKE_COLOR_MAKEFILE=OFF \
+	-DCMAKE_BUILD_TYPE="None" \
+	-DCMAKE_SYSTEM_NAME="Linux" \
+	-DCMAKE_SYSTEM_PROCESSOR="$(TARGET_ARCH)" \
+	-DCMAKE_INSTALL_PREFIX="$(prefix)" \
+	-DCMAKE_INSTALL_DOCDIR="$(REMOVE_docdir)" \
+	-DCMAKE_INSTALL_MANDIR="$(REMOVE_mandir)" \
+	-DCMAKE_PREFIX_PATH="$(TARGET_DIR)" \
+	-DCMAKE_INCLUDE_PATH="$(TARGET_includedir)" \
+	-DCMAKE_C_COMPILER="$(TARGET_CC)" \
+	-DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -DNDEBUG" \
+	-DCMAKE_CPP_COMPILER="$(TARGET_CPP)" \
+	-DCMAKE_CPP_FLAGS="$(TARGET_CFLAGS) -DNDEBUG" \
+	-DCMAKE_CXX_COMPILER="$(TARGET_CXX)" \
+	-DCMAKE_CXX_FLAGS="$(TARGET_CFLAGS) -DNDEBUG" \
+	-DCMAKE_LINKER="$(TARGET_LD)" \
+	-DCMAKE_AR="$(TARGET_AR)" \
+	-DCMAKE_AS="$(TARGET_AS)" \
+	-DCMAKE_NM="$(TARGET_NM)" \
+	-DCMAKE_OBJCOPY="$(TARGET_OBJCOPY)" \
+	-DCMAKE_OBJDUMP="$(TARGET_OBJDUMP)" \
+	-DCMAKE_RANLIB="$(TARGET_RANLIB)" \
+	-DCMAKE_READELF="$(TARGET_READELF)" \
+	-DCMAKE_STRIP="$(TARGET_STRIP)"
+
+TARGET_CMAKE_OPTS += \
+	$($(PKG)_CONF_OPTS)
+
+define TARGET_CMAKE
+	@$(call MESSAGE,"Configuring")
+	$(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep))
+	$(Q)( \
+	$(CHDIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR); \
+		rm -f CMakeCache.txt; \
+		$(TARGET_CMAKE_ENV) cmake $(TARGET_CMAKE_OPTS); \
+	)
+	$(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep))
+endef
+
 define cmake-package
 	$(call PREPARE)
 	$(call TARGET_CMAKE)
@ -14,6 +69,42 @@ define cmake-package
 	$(call TARGET_FOLLOWUP)
 endef

+# -----------------------------------------------------------------------------
+
+HOST_CMAKE_ENV = \
+	$($(PKG)_CONF_ENV)
+
+HOST_CMAKE_OPTS += \
+	--no-warn-unused-cli
+
+HOST_CMAKE_OPTS += \
+	-DENABLE_STATIC=OFF \
+	-DBUILD_SHARED_LIBS=ON \
+	-DBUILD_DOC=OFF \
+	-DBUILD_DOCS=OFF \
+	-DBUILD_EXAMPLE=OFF \
+	-DBUILD_EXAMPLES=OFF \
+	-DBUILD_TEST=OFF \
+	-DBUILD_TESTS=OFF \
+	-DBUILD_TESTING=OFF \
+	-DCMAKE_COLOR_MAKEFILE=OFF \
+	-DCMAKE_INSTALL_PREFIX="$(HOST_DIR)" \
+	-DCMAKE_PREFIX_PATH="$(HOST_DIR)"
+
+HOST_CMAKE_OPTS += \
+	$($(PKG)_CONF_OPTS)
+
+define HOST_CMAKE
+	@$(call MESSAGE,"Configuring")
+	$(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep))
+	$(Q)( \
+	$(CHDIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR); \
+		rm -f CMakeCache.txt; \
+		$(HOST_CMAKE_ENV) cmake $(HOST_CMAKE_OPTS); \
+	)
+	$(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep))
+endef
+
 define host-cmake-package
 	$(call PREPARE)
 	$(call HOST_CMAKE)