Browse Source

- add $(PKG)_PATCH_CUSTOM

master
vanhofen 3 years ago
parent
commit
cdc67d900d
  1. 4
      make/buildsystem-helpers.mk
  2. 3
      package/pkg-utils.mk

4
make/buildsystem-helpers.mk

@ -137,7 +137,7 @@ define APPLY_PATCHES # (patches or directory)
$(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); \
for i in $(1); do \ for i in $(1) $(2); do \
if [ "$$i" == "$(PKG_PATCHES_DIR)" -a ! -d $$i ]; then \ if [ "$$i" == "$(PKG_PATCHES_DIR)" -a ! -d $$i ]; then \
continue; \ continue; \
fi; \ fi; \
@ -170,7 +170,7 @@ define PREPARE
$(call DEPENDENCIES) $(call DEPENDENCIES)
$(call DOWNLOAD,$($(PKG)_SOURCE)) $(call DOWNLOAD,$($(PKG)_SOURCE))
$(if $(filter $(1),$(PKG_NO_EXTRACT)),,$(call EXTRACT,$(BUILD_DIR))) $(if $(filter $(1),$(PKG_NO_EXTRACT)),,$(call EXTRACT,$(BUILD_DIR)))
$(if $(filter $(1),$(PKG_NO_PATCHES)),,$(call APPLY_PATCHES,$($(PKG)_PATCH))) $(if $(filter $(1),$(PKG_NO_PATCHES)),,$(call APPLY_PATCHES,$($(PKG)_PATCH),$($(PKG)_PATCH_CUSTOM)))
endef endef
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------

3
package/pkg-utils.mk

@ -22,6 +22,9 @@ define PKG_CHECK_VARIABLES
ifndef $(PKG)_PATCH ifndef $(PKG)_PATCH
$(PKG)_PATCH = $(PKG_PATCHES_DIR) $(PKG)_PATCH = $(PKG_PATCHES_DIR)
endif endif
ifndef $(PKG)_PATCH_CUSTOM
$(PKG)_PATCH_CUSTOM =
endif
# autoreconf # autoreconf
ifndef $(PKG)_AUTORECONF ifndef $(PKG)_AUTORECONF

Loading…
Cancel
Save