7 files changed, 9 insertions, 6 deletions
diff --git a/plugins/apps/qbittorrent.mk b/plugins/apps/qbittorrent.mk
index 8c3cd88..3b645ca 100644
--- a/plugins/apps/qbittorrent.mk
+++ b/plugins/apps/qbittorrent.mk
@@ -9,7 +9,7 @@ $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := https://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(PKG)-$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_WEBSITE  := https://qbittorrent.org/
 $(PKG)_OWNER    := https://github.com/starius
-$(PKG)_DEPS     := gcc boost libtorrent-rasterbar qt
+$(PKG)_DEPS     := gcc boost libtorrent-rasterbar qt $(BUILD)~geoip-database
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'https://www.qbittorrent.org/download.php' | \
diff --git a/plugins/apps/wrk.mk b/plugins/apps/wrk.mk
index d41d50f..2efb6c8 100644
--- a/plugins/apps/wrk.mk
+++ b/plugins/apps/wrk.mk
@@ -9,7 +9,7 @@ $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://github.com/wg/wrk/archive/$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := https://github.com/wg/wrk
 $(PKG)_OWNER    := https://github.com/starius
-$(PKG)_DEPS     := gcc luajit openssl pthreads
+$(PKG)_DEPS     := gcc luajit openssl pthreads $(BUILD)~luajit
 
 define $(PKG)_UPDATE
     $(call MXE_GET_GITHUB_TAGS, wg/wrk)
diff --git a/plugins/gcc4/gcc4.mk b/plugins/gcc4/gcc4.mk
index 789c033..9a8f0e6 100644
--- a/plugins/gcc4/gcc4.mk
+++ b/plugins/gcc4/gcc4.mk
@@ -11,7 +11,7 @@ $(PKG)_FILE     := gcc-$($(PKG)_VERSION).tar.bz2
 $(PKG)_PATCHES  := $(basename $(lastword $(MAKEFILE_LIST))).patch
 $(PKG)_URL      := https://ftp.gnu.org/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_URL_2    := https://www.mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_DEPS     := binutils mingw-w64
+$(PKG)_DEPS     := binutils mingw-w64 $(addprefix $(BUILD)~,cloog gmp isl mpc mpfr)
 
 $(PKG)_FILE_$(BUILD) :=
 
diff --git a/plugins/go/go-native.mk b/plugins/go/go-native.mk
index f85fcd7..f75cdb4 100644
--- a/plugins/go/go-native.mk
+++ b/plugins/go/go-native.mk
@@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64
 $(PKG)_SUBDIR   := go
 $(PKG)_FILE     := go$($(PKG)_VERSION).src.tar.gz
 $(PKG)_URL      := https://storage.googleapis.com/golang/$($(PKG)_FILE)
-$(PKG)_DEPS_$(BUILD) :=
+$(PKG)_DEPS     :=
 $(PKG)_TARGETS  := $(BUILD)
 
 define $(PKG)_UPDATE
diff --git a/plugins/go/go.mk b/plugins/go/go.mk
index a380204..f72b038 100644
--- a/plugins/go/go.mk
+++ b/plugins/go/go.mk
@@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := 406865f587b44be7092f206d73fc1de252600b79b3cacc587b74b5ef5c623
 $(PKG)_SUBDIR   := go
 $(PKG)_FILE     := go$($(PKG)_VERSION).src.tar.gz
 $(PKG)_URL      := https://storage.googleapis.com/golang/$($(PKG)_FILE)
-$(PKG)_DEPS     :=
+$(PKG)_DEPS     := $(BUILD)~go-native
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'https://golang.org/dl/' | \
diff --git a/plugins/luarocks/luarocks.mk b/plugins/luarocks/luarocks.mk
index 2056549..d4450a8 100644
--- a/plugins/luarocks/luarocks.mk
+++ b/plugins/luarocks/luarocks.mk
@@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := 68e38feeb66052e29ad1935a71b875194ed8b9c67c2223af5f4d4e3e2464e
 $(PKG)_SUBDIR   := luarocks-$($(PKG)_VERSION)
 $(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
 $(PKG)_URL      := https://keplerproject.github.io/luarocks/releases/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc lua
+$(PKG)_DEPS     := gcc lua $(BUILD)~lua
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'https://keplerproject.github.io/luarocks/releases/' | \
diff --git a/plugins/native/patch.mk b/plugins/native/patch.mk
index 2740d55..e9f1082 100644
--- a/plugins/native/patch.mk
+++ b/plugins/native/patch.mk
@@ -13,6 +13,9 @@ $(PKG)_OWNER    := https://github.com/tonytheodore
 $(PKG)_TARGETS  := $(BUILD)
 $(PKG)_DEPS     :=
 
+# recursive variable so always use literal instead of $(PKG)
+MXE_REQS_PKGS   += $(BUILD)~patch
+
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'https://ftp.gnu.org/gnu/patch/?C=M;O=D' | \
     $(SED) -n 's,.*<a href="patch-\([0-9][^"]*\)\.tar.*,\1,p' | \