X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=package%2FMakefile;h=1930d27cf8b31640ddf6aca8d6816312f81373d0;hp=f82654cf900a286289dc7cbc09750cdcaecc20ac;hb=f648e5117233f874f8245dfffd7830a0057555b5;hpb=2d7ad98b392d38fdb6e37af8a12ef8db272663a4 diff --git a/package/Makefile b/package/Makefile index f82654cf90..1930d27cf8 100644 --- a/package/Makefile +++ b/package/Makefile @@ -10,17 +10,15 @@ curdir:=package -include $(TMP_DIR)/.packagedeps $(curdir)/builddirs:=$(sort $(package-) $(package-y) $(package-m)) $(curdir)/builddirs-install:=. -ifeq ($(SDK),1) -else - $(curdir)/builddirs-default:=. $(sort $(package-y) $(package-m)) - $(curdir)/builddirs-prereq:=. $(sort $(prereq-y) $(prereq-m)) -endif +$(curdir)/builddirs-default:=. $(sort $(package-y) $(package-m)) +$(curdir)/builddirs-prereq:=. $(sort $(prereq-y) $(prereq-m)) ifneq ($(IGNORE_ERRORS),) package-y-filter := $(package-y) package-m-filter := $(filter-out $(package-y),$(package-m)) package-n-filter := $(filter-out $(package-y) $(package-m),$(package-)) package-ignore-errors := $(filter n m y,$(IGNORE_ERRORS)) package-ignore-errors := $(if $(package-ignore-errors),$(package-ignore-errors),n m) + $(curdir)/builddirs-ignore-download := $(foreach m,$(package-ignore-errors),$(package-$(m)-filter)) $(curdir)/builddirs-ignore-compile := $(foreach m,$(package-ignore-errors),$(package-$(m)-filter)) endif @@ -28,7 +26,7 @@ ifdef CONFIG_USE_MKLIBS define mklibs rm -rf $(TMP_DIR)/mklibs-progs $(TMP_DIR)/mklibs-out # first find all programs and add them to the mklibs list - find $(STAGING_DIR_ROOT) -type f -perm +100 -exec \ + find $(STAGING_DIR_ROOT) -type f -perm /100 -exec \ file -r -N -F '' {} + | \ awk ' /executable.*dynamically/ { print $$1 }' > $(TMP_DIR)/mklibs-progs # find all loadable objects that are not regular libraries and add them to the list as well @@ -76,7 +74,7 @@ OPKG:= \ PACKAGE_INSTALL_FILES:= \ $(foreach pkg,$(sort $(package-y)), \ $(foreach variant, \ - $(if $(package/$(pkg)/variants), \ + $(if $(strip $(package/$(pkg)/variants)), \ $(package/$(pkg)/variants), \ $(if $(package/$(pkg)/default-variant), \ $(package/$(pkg)/default-variant), \