projects
/
oweals
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
uboot-mvebu: fix build on hosts lacking pkg-config
[oweals/openwrt.git]
/
include
/
package.mk
diff --git
a/include/package.mk
b/include/package.mk
index 78ea5d0ef8b73e758466b48f4a9d652daae7d59c..2473eecb922074e415496e1add86cf2c9c47cccb 100644
(file)
--- a/
include/package.mk
+++ b/
include/package.mk
@@
-120,7
+120,12
@@
ifdef USE_GIT_TREE
define Build/Prepare/Default
mkdir -p $(PKG_BUILD_DIR)
ln -s $(CURDIR)/git-src $(PKG_BUILD_DIR)/.git
define Build/Prepare/Default
mkdir -p $(PKG_BUILD_DIR)
ln -s $(CURDIR)/git-src $(PKG_BUILD_DIR)/.git
- ( cd $(PKG_BUILD_DIR); git checkout .)
+ ( cd $(PKG_BUILD_DIR); \
+ git checkout .; \
+ git submodule update --recursive; \
+ git submodule foreach git config --unset core.worktree; \
+ git submodule foreach git checkout .; \
+ )
endef
endif
ifdef USE_SOURCE_DIR
endef
endif
ifdef USE_SOURCE_DIR
@@
-223,7
+228,7
@@
define Build/CoreTargets
ifneq ($(CONFIG_AUTOREMOVE),)
compile:
ifneq ($(CONFIG_AUTOREMOVE),)
compile:
- -touch $(PKG_BUILD_DIR)/.autoremove 2>/dev/null >/dev/null
+ -touch
-r $(PKG_BUILD_DIR)/.built
$(PKG_BUILD_DIR)/.autoremove 2>/dev/null >/dev/null
$(FIND) $(PKG_BUILD_DIR) -mindepth 1 -maxdepth 1 -not '(' -type f -and -name '.*' -and -size 0 ')' -and -not -name '.pkgdir' | \
$(XARGS) rm -rf
endif
$(FIND) $(PKG_BUILD_DIR) -mindepth 1 -maxdepth 1 -not '(' -type f -and -name '.*' -and -size 0 ')' -and -not -name '.pkgdir' | \
$(XARGS) rm -rf
endif