From e7b9a210560fe05b44c33b3624617b2d581281e7 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Sat, 25 Nov 2017 21:48:27 +1100
Subject: native pkgs: use explicit cross-target deps and remove empty rules

---
 plugins/apps/qbittorrent.mk  | 2 +-
 plugins/apps/wrk.mk          | 2 +-
 plugins/gcc4/gcc4.mk         | 2 +-
 plugins/go/go-native.mk      | 2 +-
 plugins/go/go.mk             | 2 +-
 plugins/luarocks/luarocks.mk | 2 +-
 plugins/native/patch.mk      | 3 +++
 src/aubio.mk                 | 2 +-
 src/cmake-conf.mk            | 1 +
 src/gcc.mk                   | 2 +-
 src/geoip-database.mk        | 2 +-
 src/glib.mk                  | 2 +-
 src/hyperscan.mk             | 3 +--
 src/nasm.mk                  | 3 +--
 src/protobuf.mk              | 2 +-
 src/sqlcipher.mk             | 2 +-
 src/waf.mk                   | 2 +-
 src/x264.mk                  | 2 +-
 src/yasm.mk                  | 2 +-
 19 files changed, 21 insertions(+), 19 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' | \
diff --git a/src/aubio.mk b/src/aubio.mk
index df75cec..1725d17 100644
--- a/src/aubio.mk
+++ b/src/aubio.mk
@@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := 1cc58e0fed2b9468305b198ad06b889f228b797a082c2ede716dc30fcb4f8
 $(PKG)_SUBDIR   := aubio-$($(PKG)_VERSION)
 $(PKG)_FILE     := aubio-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := https://www.aubio.org/pub/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc ffmpeg fftw jack libsamplerate libsndfile waf
+$(PKG)_DEPS     := gcc ffmpeg fftw jack libsamplerate libsndfile $(BUILD)~waf
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'https://www.aubio.org/download' | \
diff --git a/src/cmake-conf.mk b/src/cmake-conf.mk
index 925f12f..3a1c86d 100644
--- a/src/cmake-conf.mk
+++ b/src/cmake-conf.mk
@@ -4,6 +4,7 @@ PKG            := cmake-conf
 $(PKG)_VERSION := 1
 $(PKG)_UPDATE  := echo 1
 $(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS)
+$(PKG)_DEPS    := $(BUILD)~cmake
 $(PKG)_FILE_DEPS := $(wildcard $(PWD)/src/cmake/conf/*)
 
 define $(PKG)_BUILD
diff --git a/src/gcc.mk b/src/gcc.mk
index 6adb29b..1eb203a 100644
--- a/src/gcc.mk
+++ b/src/gcc.mk
@@ -10,7 +10,7 @@ $(PKG)_SUBDIR   := gcc-$($(PKG)_VERSION)
 $(PKG)_FILE     := gcc-$($(PKG)_VERSION).tar.bz2
 $(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)~,gmp isl mpc mpfr)
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'https://ftp.gnu.org/gnu/gcc/?C=M;O=D' | \
diff --git a/src/geoip-database.mk b/src/geoip-database.mk
index 7b22862..56b4bfa 100644
--- a/src/geoip-database.mk
+++ b/src/geoip-database.mk
@@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := 45be84939fd22bef1ccaa1189f83c667fef275a16bbfb91f82b7b2068b4e3
 $(PKG)_SUBDIR   := .
 $(PKG)_FILE     := $(PKG)_$($(PKG)_VERSION)_all.deb
 $(PKG)_URL      := http://http.debian.net/debian/pool/main/g/$(PKG)/$($(PKG)_FILE)
-$(PKG)_TARGETS  := $(BUILD) $(MXE_TARGETS)
+$(PKG)_TARGETS  := $(BUILD)
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'https://packages.debian.org/jessie/all/geoip-database/download' | \
diff --git a/src/glib.mk b/src/glib.mk
index 406aa19..c09dd29 100644
--- a/src/glib.mk
+++ b/src/glib.mk
@@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := be68737c1f268c05493e503b3b654d2b7f43d7d0b8c5556f7e4651b870acf
 $(PKG)_SUBDIR   := glib-$($(PKG)_VERSION)
 $(PKG)_FILE     := glib-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := https://download.gnome.org/sources/glib/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc dbus gettext libffi libiconv pcre zlib
+$(PKG)_DEPS     := gcc dbus gettext libffi libiconv pcre zlib $(BUILD)~$(PKG)
 $(PKG)_TARGETS  := $(BUILD) $(MXE_TARGETS)
 
 $(PKG)_DEPS_$(BUILD) := autotools gettext libiconv zlib
diff --git a/src/hyperscan.mk b/src/hyperscan.mk
index 5179b54..7bbbcbb 100644
--- a/src/hyperscan.mk
+++ b/src/hyperscan.mk
@@ -7,8 +7,7 @@ $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 4.3.2
 $(PKG)_CHECKSUM := 6cd5820d6da51d6fe4ab12066d1efd9afecc1bc6fb7d6eca9c98f76fd391dbd5
 $(PKG)_GH_CONF  := 01org/hyperscan/tags, v
-$(PKG)_DEPS     := gcc boost
-# $(PKG)_NATIVE_DEPS := ragel
+$(PKG)_DEPS     := gcc boost $(BUILD)~ragel
 
 # Add the following options to run on (virtual) machine without AVX2 or
 # build on machine where native detection of SSSE3 may fail
diff --git a/src/nasm.mk b/src/nasm.mk
index e441bb3..0f40623 100644
--- a/src/nasm.mk
+++ b/src/nasm.mk
@@ -9,8 +9,7 @@ $(PKG)_CHECKSUM := aa0213008f0433ecbe07bb628506a5c4be8079be20fc3532a5031fd639db9
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://www.nasm.us/pub/$(PKG)/releasebuilds/$($(PKG)_VERSION)/$($(PKG)_FILE)
-# add cross targets for explicit deps even though nothing is built
-$(PKG)_TARGETS  := $(BUILD) $(MXE_TARGETS)
+$(PKG)_TARGETS  := $(BUILD)
 $(PKG)_DEPS     :=
 
 define $(PKG)_UPDATE
diff --git a/src/protobuf.mk b/src/protobuf.mk
index d04864e..855685d 100644
--- a/src/protobuf.mk
+++ b/src/protobuf.mk
@@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := f6600abeee3babfa18591961a0ff21e7db6a6d9ef82418a261ec4fee44ee6
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://github.com/google/$(PKG)/archive/v$($(PKG)_VERSION).tar.gz
-$(PKG)_DEPS     := gcc googlemock googletest zlib
+$(PKG)_DEPS     := gcc googlemock googletest zlib $(BUILD)~$(PKG)
 $(PKG)_TARGETS  := $(BUILD) $(MXE_TARGETS)
 $(PKG)_DEPS_$(BUILD) := googlemock googletest libtool
 
diff --git a/src/sqlcipher.mk b/src/sqlcipher.mk
index 99b0dcc..5493043 100644
--- a/src/sqlcipher.mk
+++ b/src/sqlcipher.mk
@@ -7,7 +7,7 @@ $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 3.4.1
 $(PKG)_CHECKSUM := 4172cc6e5a79d36e178d36bd5cc467a938e08368952659bcd95eccbaf0fa4ad4
 $(PKG)_GH_CONF  := sqlcipher/sqlcipher/tags, v
-$(PKG)_DEPS     := gcc openssl readline
+$(PKG)_DEPS     := gcc openssl readline $(BUILD)~tcl
 
 define $(PKG)_BUILD
     # build and install the library
diff --git a/src/waf.mk b/src/waf.mk
index a0c1210..0243872 100644
--- a/src/waf.mk
+++ b/src/waf.mk
@@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := 63c53b03dd23afde1008dced06a011dad581d24392818c8069a40af99f6ac
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := https://waf.io/$($(PKG)_FILE)
-$(PKG)_TARGETS  := $(BUILD) $(MXE_TARGETS)
+$(PKG)_TARGETS  := $(BUILD)
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'https://waf.io/' | \
diff --git a/src/x264.mk b/src/x264.mk
index 1b90374..7544845 100644
--- a/src/x264.mk
+++ b/src/x264.mk
@@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := 28cf90f63964e24e65b05084c75d114a997004c8d3f72feae7229da3a0989
 $(PKG)_SUBDIR   := $(PKG)-snapshot-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-snapshot-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := https://download.videolan.org/pub/videolan/$(PKG)/snapshots/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc liblsmash nasm
+$(PKG)_DEPS     := gcc liblsmash $(BUILD)~nasm
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'https://git.videolan.org/?p=x264.git;a=shortlog' | \
diff --git a/src/yasm.mk b/src/yasm.mk
index 58cf45d..05a5322 100644
--- a/src/yasm.mk
+++ b/src/yasm.mk
@@ -10,7 +10,7 @@ $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://www.tortall.net/projects/$(PKG)/releases/$($(PKG)_FILE)
 $(PKG)_TARGETS  := $(BUILD) $(MXE_TARGETS)
-$(PKG)_DEPS     := gcc
+$(PKG)_DEPS     := gcc $(BUILD)~$(PKG)
 
 $(PKG)_DEPS_$(BUILD) :=
 
-- 
cgit v0.12