topaLE
/
ni-buildsystem
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

- unify $(PKG)_CONFIGURE_CMDS

master
vanhofen 3 years ago
parent
a41e60f8ea
commit
4d6dd43769
3 changed files with 44 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      package/pkg-cmake.mk
  2. 33
      package/pkg-meson.mk
  3. 37
      package/pkg-utils.mk

4
package/pkg-cmake.mk
View File

@ -55,7 +55,7 @@ endef
define TARGET_CMAKE define TARGET_CMAKE
@$(call MESSAGE,"Configuring") @$(call MESSAGE,"Configuring")
$(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep))
$(Q)$(call $(PKG)_CMAKE_CMDS) $(Q)$(call $(PKG)_CONFIGURE_CMDS)
$(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep))
endef endef
@ -102,7 +102,7 @@ endef
define HOST_CMAKE define HOST_CMAKE
@$(call MESSAGE,"Configuring") @$(call MESSAGE,"Configuring")
$(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep))
$(Q)$(call $(PKG)_CMAKE_CMDS) $(Q)$(call $(PKG)_CONFIGURE_CMDS)
$(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep))
endef endef

33
package/pkg-meson.mk
View File

@ -42,11 +42,7 @@ endef
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
define TARGET_MESON_CONFIGURE define TARGET_MESON_CMDS
@$(call MESSAGE,"Configuring")
$(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep))
$(call MESON_CROSS_CONFIG_HOOK,$(PKG_BUILD_DIR)/build)
$(Q)( \
unset CC CXX CPP LD AR NM STRIP; \ unset CC CXX CPP LD AR NM STRIP; \
$(CHDIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR); \ $(CHDIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR); \
$($(PKG)_CONF_ENV) \ $($(PKG)_CONF_ENV) \
@ -56,8 +52,14 @@ define TARGET_MESON_CONFIGURE
-Db_pie=false \ -Db_pie=false \
-Dstrip=false \ -Dstrip=false \
$($(PKG)_CONF_OPTS) \ $($(PKG)_CONF_OPTS) \
$(PKG_BUILD_DIR) $(PKG_BUILD_DIR)/build; \ $(PKG_BUILD_DIR) $(PKG_BUILD_DIR)/build
) endef
define TARGET_MESON_CONFIGURE
@$(call MESSAGE,"Configuring")
$(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep))
$(Q)$(call MESON_CROSS_CONFIG_HOOK,$(PKG_BUILD_DIR)/build)
$(Q)$(call $(PKG)_CONFIGURE_CMDS)
$(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep))
endef endef
@ -71,7 +73,8 @@ endef
define TARGET_NINJA_INSTALL define TARGET_NINJA_INSTALL
$(CHDIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR); \ $(CHDIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR); \
$(TARGET_MAKE_ENV) $($(PKG)_NINJA_ENV) \ $(TARGET_MAKE_ENV) $($(PKG)_NINJA_ENV) \
$(HOST_NINJA_BINARY) -C $(PKG_BUILD_DIR)/build install DESTDIR=$(TARGET_DIR) \ DESTDIR=$(TARGET_DIR) \
$(HOST_NINJA_BINARY) -C $(PKG_BUILD_DIR)/build install \
$($(PKG)_NINJA_OPTS) $($(PKG)_NINJA_OPTS)
endef endef
@ -88,10 +91,7 @@ endef
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
define HOST_MESON_CONFIGURE define HOST_MESON_CMDS
@$(call MESSAGE,"Configuring")
$(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep))
$(Q)( \
unset CC CXX CPP LD AR NM STRIP; \ unset CC CXX CPP LD AR NM STRIP; \
PKG_CONFIG=/usr/bin/pkg-config \ PKG_CONFIG=/usr/bin/pkg-config \
PKG_CONFIG_PATH=$(HOST_DIR)/lib/pkgconfig \ PKG_CONFIG_PATH=$(HOST_DIR)/lib/pkgconfig \
@ -101,8 +101,13 @@ define HOST_MESON_CONFIGURE
--prefix=$(HOST_DIR) \ --prefix=$(HOST_DIR) \
--buildtype=release \ --buildtype=release \
$($(PKG)_CONF_OPTS) \ $($(PKG)_CONF_OPTS) \
$(PKG_BUILD_DIR) $(PKG_BUILD_DIR)/build; \ $(PKG_BUILD_DIR) $(PKG_BUILD_DIR)/build
) endef
define HOST_MESON_CONFIGURE
@$(call MESSAGE,"Configuring")
$(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep))
$(Q)$(call $(PKG)_CONFIGURE_CMDS)
$(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep))
endef endef

37
package/pkg-utils.mk
View File

@ -47,25 +47,11 @@ endif
ifndef $(PKG)_CMAKE ifndef $(PKG)_CMAKE
$(PKG)_CMAKE = cmake $(PKG)_CMAKE = cmake
endif endif
ifndef $(PKG)_CMAKE_CMDS
ifeq ($(PKG_HOST_PACKAGE),YES)
$(PKG)_CMAKE_CMDS = $$(HOST_CMAKE_CMDS)
else
$(PKG)_CMAKE_CMDS = $$(TARGET_CMAKE_CMDS)
endif
endif
# configure # configure
ifndef $(PKG)_CONFIGURE_CMD ifndef $(PKG)_CONFIGURE_CMD
$(PKG)_CONFIGURE_CMD = configure $(PKG)_CONFIGURE_CMD = configure
endif endif
ifndef $(PKG)_CONFIGURE_CMDS
ifeq ($(PKG_HOST_PACKAGE),YES)
$(PKG)_CONFIGURE_CMDS = $$(HOST_CONFIGURE_CMDS)
else
$(PKG)_CONFIGURE_CMDS = $$(TARGET_CONFIGURE_CMDS)
endif
endif
ifndef $(PKG)_CONF_ENV ifndef $(PKG)_CONF_ENV
$(PKG)_CONF_ENV = $(PKG)_CONF_ENV =
endif endif
@ -73,6 +59,29 @@ ifndef $(PKG)_CONF_OPTS
$(PKG)_CONF_OPTS = $(PKG)_CONF_OPTS =
endif endif
# configure commands
ifndef $(PKG)_CONFIGURE_CMDS
ifeq ($(PKG_MODE),CMAKE)
ifeq ($(PKG_HOST_PACKAGE),YES)
$(PKG)_CONFIGURE_CMDS = $$(HOST_CMAKE_CMDS)
else
$(PKG)_CONFIGURE_CMDS = $$(TARGET_CMAKE_CMDS)
endif
else ifeq ($(PKG_MODE),MESON)
ifeq ($(PKG_HOST_PACKAGE),YES)
$(PKG)_CONFIGURE_CMDS = $$(HOST_MESON_CMDS)
else
$(PKG)_CONFIGURE_CMDS = $$(TARGET_MESON_CMDS)
endif
else
ifeq ($(PKG_HOST_PACKAGE),YES)
$(PKG)_CONFIGURE_CMDS = $$(HOST_CONFIGURE_CMDS)
else
$(PKG)_CONFIGURE_CMDS = $$(TARGET_CONFIGURE_CMDS)
endif
endif
endif
# make # make
ifndef $(PKG)_MAKE ifndef $(PKG)_MAKE
$(PKG)_MAKE = $$(MAKE) $(PKG)_MAKE = $$(MAKE)

Write Preview
Loading…
Cancel
Save