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

- add $(pkgname) to console messages

master
vanhofen 3 years ago
parent
0a618741c5
commit
277fa391df
7 changed files with 27 additions and 27 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. 6
      package/pkg-autotools.mk
  2. 4
      package/pkg-cmake.mk
  3. 8
      package/pkg-generic.mk
  4. 2
      package/pkg-individual.mk
  5. 2
      package/pkg-kernel-module.mk
  6. 12
      package/pkg-meson.mk
  7. 20
      package/pkg-utils.mk

6
package/pkg-autotools.mk
View File

@ -6,7 +6,7 @@
define AUTORECONF_HOOK define AUTORECONF_HOOK
if [ "$($(PKG)_AUTORECONF)" == "YES" ]; then \ if [ "$($(PKG)_AUTORECONF)" == "YES" ]; then \
$(call MESSAGE,"Autoreconfiguring"); \ $(call MESSAGE,"Autoreconfiguring $(pkgname)"); \
$(CHDIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR); \ $(CHDIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR); \
$($(PKG)_AUTORECONF_ENV) \ $($(PKG)_AUTORECONF_ENV) \
$($(PKG)_AUTORECONF_CMD) \ $($(PKG)_AUTORECONF_CMD) \
@ -82,7 +82,7 @@ define TARGET_CONFIGURE_CMDS_DEFAULT
endef endef
define TARGET_CONFIGURE define TARGET_CONFIGURE
@$(call MESSAGE,"Configuring") @$(call MESSAGE,"Configuring $(pkgname)")
$(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep))
$(Q)$(call AUTORECONF_HOOK) $(Q)$(call AUTORECONF_HOOK)
$(Q)$(call $(PKG)_CONFIGURE_CMDS) $(Q)$(call $(PKG)_CONFIGURE_CMDS)
@ -139,7 +139,7 @@ define HOST_CONFIGURE_CMDS_DEFAULT
endef endef
define HOST_CONFIGURE define HOST_CONFIGURE
@$(call MESSAGE,"Configuring") @$(call MESSAGE,"Configuring $(pkgname)")
$(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep))
$(Q)$(call AUTORECONF_HOOK) $(Q)$(call AUTORECONF_HOOK)
$(Q)$(call $(PKG)_CONFIGURE_CMDS) $(Q)$(call $(PKG)_CONFIGURE_CMDS)

4
package/pkg-cmake.mk
View File

@ -53,7 +53,7 @@ define TARGET_CMAKE_CMDS_DEFAULT
endef endef
define TARGET_CMAKE define TARGET_CMAKE
@$(call MESSAGE,"Configuring") @$(call MESSAGE,"Configuring $(pkgname)")
$(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep))
$(Q)$(call $(PKG)_CONFIGURE_CMDS) $(Q)$(call $(PKG)_CONFIGURE_CMDS)
$(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep))
@ -100,7 +100,7 @@ define HOST_CMAKE_CMDS_DEFAULT
endef endef
define HOST_CMAKE define HOST_CMAKE
@$(call MESSAGE,"Configuring") @$(call MESSAGE,"Configuring $(pkgname)")
$(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep))
$(Q)$(call $(PKG)_CONFIGURE_CMDS) $(Q)$(call $(PKG)_CONFIGURE_CMDS)
$(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep))

8
package/pkg-generic.mk
View File

@ -14,7 +14,7 @@ define TARGET_MAKE_BUILD_CMDS_DEFAULT
endef endef
define TARGET_MAKE_BUILD define TARGET_MAKE_BUILD
@$(call MESSAGE,"Building") @$(call MESSAGE,"Building $(pkgname)")
$(foreach hook,$($(PKG)_PRE_BUILD_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_PRE_BUILD_HOOKS),$(call $(hook))$(sep))
$(Q)$(call $(PKG)_BUILD_CMDS) $(Q)$(call $(PKG)_BUILD_CMDS)
$(foreach hook,$($(PKG)_POST_BUILD_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_POST_BUILD_HOOKS),$(call $(hook))$(sep))
@ -28,7 +28,7 @@ define TARGET_MAKE_INSTALL_CMDS_DEFAULT
endef endef
define TARGET_MAKE_INSTALL define TARGET_MAKE_INSTALL
@$(call MESSAGE,"Installing") @$(call MESSAGE,"Installing $(pkgname)")
$(foreach hook,$($(PKG)_PRE_INSTALL_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_PRE_INSTALL_HOOKS),$(call $(hook))$(sep))
$(Q)$(call $(PKG)_INSTALL_CMDS) $(Q)$(call $(PKG)_INSTALL_CMDS)
$(foreach hook,$($(PKG)_POST_INSTALL_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_POST_INSTALL_HOOKS),$(call $(hook))$(sep))
@ -56,7 +56,7 @@ define HOST_MAKE_BUILD_CMDS_DEFAULT
endef endef
define HOST_MAKE_BUILD define HOST_MAKE_BUILD
@$(call MESSAGE,"Compiling") @$(call MESSAGE,"Building $(pkgname)")
$(foreach hook,$($(PKG)_PRE_BUILD_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_PRE_BUILD_HOOKS),$(call $(hook))$(sep))
$(Q)$(call $(PKG)_BUILD_CMDS) $(Q)$(call $(PKG)_BUILD_CMDS)
$(foreach hook,$($(PKG)_POST_BUILD_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_POST_BUILD_HOOKS),$(call $(hook))$(sep))
@ -70,7 +70,7 @@ define HOST_MAKE_INSTALL_CMDS_DEFAULT
endef endef
define HOST_MAKE_INSTALL define HOST_MAKE_INSTALL
@$(call MESSAGE,"Installing") @$(call MESSAGE,"Installing $(pkgname)")
$(foreach hook,$($(PKG)_PRE_INSTALL_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_PRE_INSTALL_HOOKS),$(call $(hook))$(sep))
$(Q)$(call $(PKG)_INSTALL_CMDS) $(Q)$(call $(PKG)_INSTALL_CMDS)
$(foreach hook,$($(PKG)_POST_INSTALL_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_POST_INSTALL_HOOKS),$(call $(hook))$(sep))

2
package/pkg-individual.mk
View File

@ -5,7 +5,7 @@
################################################################################ ################################################################################
define INDIVIDUAL define INDIVIDUAL
@$(call MESSAGE,"Individual build and/or install") @$(call MESSAGE,"Individual build and/or install $(pkgname)")
$(foreach hook,$($(PKG)_INDIVIDUAL_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_INDIVIDUAL_HOOKS),$(call $(hook))$(sep))
endef endef

2
package/pkg-kernel-module.mk
View File

@ -25,7 +25,7 @@ define KERNEL_MODULE_BUILD_CMDS_DEFAULT
endef endef
define KERNEL_MODULE_BUILD define KERNEL_MODULE_BUILD
@$(call MESSAGE,"Building kernel module") @$(call MESSAGE,"Building $(pkgname) kernel module")
$(foreach hook,$($(PKG)_PRE_BUILD_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_PRE_BUILD_HOOKS),$(call $(hook))$(sep))
$(Q)$(call $(PKG)_BUILD_CMDS) $(Q)$(call $(PKG)_BUILD_CMDS)
$(foreach hook,$($(PKG)_POST_BUILD_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_POST_BUILD_HOOKS),$(call $(hook))$(sep))

12
package/pkg-meson.mk
View File

@ -56,7 +56,7 @@ define TARGET_MESON_CMDS_DEFAULT
endef endef
define TARGET_MESON_CONFIGURE define TARGET_MESON_CONFIGURE
@$(call MESSAGE,"Configuring") @$(call MESSAGE,"Configuring $(pkgname)")
$(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep))
$(Q)$(call MESON_CROSS_CONFIG_HOOK,$(PKG_BUILD_DIR)/build) $(Q)$(call MESON_CROSS_CONFIG_HOOK,$(PKG_BUILD_DIR)/build)
$(Q)$(call $(PKG)_CONFIGURE_CMDS) $(Q)$(call $(PKG)_CONFIGURE_CMDS)
@ -71,7 +71,7 @@ define TARGET_NINJA_BUILD_CMDS_DEFAULT
endef endef
define TARGET_NINJA_BUILD define TARGET_NINJA_BUILD
@$(call MESSAGE,"Building") @$(call MESSAGE,"Building $(pkgname)")
$(foreach hook,$($(PKG)_PRE_BUILD_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_PRE_BUILD_HOOKS),$(call $(hook))$(sep))
$(Q)$(call $(PKG)_BUILD_CMDS) $(Q)$(call $(PKG)_BUILD_CMDS)
$(foreach hook,$($(PKG)_POST_BUILD_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_POST_BUILD_HOOKS),$(call $(hook))$(sep))
@ -86,7 +86,7 @@ define TARGET_NINJA_INSTALL_CMDS_DEFAULT
endef endef
define TARGET_NINJA_INSTALL define TARGET_NINJA_INSTALL
@$(call MESSAGE,"Installing") @$(call MESSAGE,"Installing $(pkgname)")
$(foreach hook,$($(PKG)_PRE_INSTALL_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_PRE_INSTALL_HOOKS),$(call $(hook))$(sep))
$(Q)$(call $(PKG)_INSTALL_CMDS) $(Q)$(call $(PKG)_INSTALL_CMDS)
$(foreach hook,$($(PKG)_POST_INSTALL_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_POST_INSTALL_HOOKS),$(call $(hook))$(sep))
@ -119,7 +119,7 @@ define HOST_MESON_CMDS_DEFAULT
endef endef
define HOST_MESON_CONFIGURE define HOST_MESON_CONFIGURE
@$(call MESSAGE,"Configuring") @$(call MESSAGE,"Configuring $(pkgname)")
$(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep))
$(Q)$(call $(PKG)_CONFIGURE_CMDS) $(Q)$(call $(PKG)_CONFIGURE_CMDS)
$(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep))
@ -133,7 +133,7 @@ define HOST_NINJA_BUILD_CMDS_DEFAULT
endef endef
define HOST_NINJA_BUILD define HOST_NINJA_BUILD
@$(call MESSAGE,"Building") @$(call MESSAGE,"Building $(pkgname)")
$(foreach hook,$($(PKG)_PRE_BUILD_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_PRE_BUILD_HOOKS),$(call $(hook))$(sep))
$(Q)$(call $(PKG)_BUILD_CMDS) $(Q)$(call $(PKG)_BUILD_CMDS)
$(foreach hook,$($(PKG)_POST_BUILD_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_POST_BUILD_HOOKS),$(call $(hook))$(sep))
@ -147,7 +147,7 @@ define HOST_NINJA_INSTALL_CMDS_DEFAULT
endef endef
define HOST_NINJA_INSTALL define HOST_NINJA_INSTALL
@$(call MESSAGE,"Installing") @$(call MESSAGE,"Installing $(pkgname)")
$(foreach hook,$($(PKG)_PRE_INSTALL_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_PRE_INSTALL_HOOKS),$(call $(hook))$(sep))
$(Q)$(call $(PKG)_INSTALL_CMDS) $(Q)$(call $(PKG)_INSTALL_CMDS)
$(foreach hook,$($(PKG)_POST_INSTALL_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_POST_INSTALL_HOOKS),$(call $(hook))$(sep))

20
package/pkg-utils.mk
View File

@ -212,7 +212,7 @@ PKG_NO_INSTALL = pkg-no-install
define CLEANUP define CLEANUP
$(Q)( \ $(Q)( \
if [ "$($(PKG)_DIR)" ]; then \ if [ "$($(PKG)_DIR)" ]; then \
$(call MESSAGE,"Clean-up"); \ $(call MESSAGE,"Clean-up $(pkgname)"); \
rm -rf $(BUILD_DIR)/$($(PKG)_DIR); \ rm -rf $(BUILD_DIR)/$($(PKG)_DIR); \
fi; \ fi; \
) )
@ -222,7 +222,7 @@ endef
# start-up build # start-up build
define STARTUP define STARTUP
@$(call MESSAGE,"Start-up build") @$(call MESSAGE,"Start-up build $(pkgname)")
$(call CLEANUP) $(call CLEANUP)
endef endef
@ -230,8 +230,8 @@ endef
# resolve dependencies # resolve dependencies
define DEPENDENCIES define DEPENDENCIES
@$(call MESSAGE,"Resolving dependencies") @$(call MESSAGE,"Resolving dependencies for $(pkgname)")
$(foreach dependency,$($(PKG)_DEPENDENCIES),$(MAKE) $(dependency)$(sep)) $(foreach dependency,$($(PKG)_DEPENDENCIES),$(Q)$(MAKE) $(dependency)$(sep))
endef endef
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
@ -240,7 +240,7 @@ endef
GET_ARCHIVE = wget --no-check-certificate -t3 -T60 -c -P GET_ARCHIVE = wget --no-check-certificate -t3 -T60 -c -P
define DOWNLOAD define DOWNLOAD
@$(call MESSAGE,"Downloading") @$(call MESSAGE,"Downloading $(pkgname)")
$(foreach hook,$($(PKG)_PRE_DOWNLOAD_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_PRE_DOWNLOAD_HOOKS),$(call $(hook))$(sep))
$(Q)( \ $(Q)( \
if [ "$($(PKG)_VERSION)" == "ni-git" ]; then \ if [ "$($(PKG)_VERSION)" == "ni-git" ]; then \
@ -268,7 +268,7 @@ download-package = $(call DOWNLOAD,$($(PKG)_SOURCE))
# unpack archives into given directory # unpack archives into given directory
define EXTRACT # (directory) define EXTRACT # (directory)
@$(call MESSAGE,"Extracting") @$(call MESSAGE,"Extracting $(pkgname)")
$(foreach hook,$($(PKG)_PRE_EXTRACT_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_PRE_EXTRACT_HOOKS),$(call $(hook))$(sep))
$(Q)( \ $(Q)( \
EXTRACT_DIR=$(1); \ EXTRACT_DIR=$(1); \
@ -312,7 +312,7 @@ define EXTRACT # (directory)
fi; \ fi; \
;; \ ;; \
*) \ *) \
$(call MESSAGE,"Cannot extract $($(PKG)_SOURCE)"); \ $(call WARNING,"Cannot extract $($(PKG)_SOURCE)"); \
false ;; \ false ;; \
esac \ esac \
) )
@ -332,7 +332,7 @@ PATCHES = \
# apply single patches or patch sets # apply single patches or patch sets
define APPLY_PATCHES # (patches or directory) define APPLY_PATCHES # (patches or directory)
@$(call MESSAGE,"Patching") @$(call MESSAGE,"Patching $(pkgname)")
$(foreach hook,$($(PKG)_PRE_PATCH_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_PRE_PATCH_HOOKS),$(call $(hook))$(sep))
$(Q)( \ $(Q)( \
$(CHDIR)/$($(PKG)_DIR); \ $(CHDIR)/$($(PKG)_DIR); \
@ -430,7 +430,7 @@ endef
# follow-up build # follow-up build
define HOST_FOLLOWUP define HOST_FOLLOWUP
@$(call MESSAGE,"Follow-up build") @$(call MESSAGE,"Follow-up build $(pkgname)")
$(foreach hook,$($(PKG)_PRE_FOLLOWUP_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_PRE_FOLLOWUP_HOOKS),$(call $(hook))$(sep))
$(call CLEANUP) $(call CLEANUP)
$(foreach hook,$($(PKG)_HOST_FINALIZE_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_HOST_FINALIZE_HOOKS),$(call $(hook))$(sep))
@ -439,7 +439,7 @@ define HOST_FOLLOWUP
endef endef
define TARGET_FOLLOWUP define TARGET_FOLLOWUP
@$(call MESSAGE,"Follow-up build") @$(call MESSAGE,"Follow-up build $(pkgname)")
$(foreach hook,$($(PKG)_PRE_FOLLOWUP_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_PRE_FOLLOWUP_HOOKS),$(call $(hook))$(sep))
$(call REWRITE_CONFIG_SCRIPTS) $(call REWRITE_CONFIG_SCRIPTS)
$(call REWRITE_LIBTOOL) $(call REWRITE_LIBTOOL)

Write Preview
Loading…
Cancel
Save