libffi: always build native (since glib is always built on linux)

plugins/native/darwin/libffi.mk

@@ -1 +0,0 @@
-../libffi.mk

plugins/native/darwin/overrides.mk

@@ -1,6 +1,5 @@
 # This file is part of MXE. See LICENSE.md for licensing information.
 
 # additional modifications to control native builds
-glib_DEPS_$(BUILD)      := libffi zlib
 gettext_BUILD_$(BUILD)  :=
 libiconv_BUILD_$(BUILD) :=

plugins/native/libffi.mk

@@ -1,13 +0,0 @@
-# This file is part of MXE. See LICENSE.md for licensing information.
-
-PKG                  := libffi
-$(PKG)_TARGETS       := $(BUILD) $(MXE_TARGETS)
-$(PKG)_DEPS_$(BUILD) :=
-
-define $(PKG)_BUILD_$(BUILD)
-    # build and install the library
-    cd '$(BUILD_DIR)' && $(SOURCE_DIR)/configure \
-        $(MXE_CONFIGURE_OPTS)
-    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
-    $(MAKE) -C '$(BUILD_DIR)' -j 1 install
-endef

src/glib.mk

@@ -12,7 +12,7 @@ $(PKG)_URL      := https://download.gnome.org/sources/glib/$(call SHORT_PKG_VERS
 $(PKG)_DEPS     := cc dbus gettext libffi libiconv pcre zlib $(BUILD)~$(PKG)
 $(PKG)_TARGETS  := $(BUILD) $(MXE_TARGETS)
 
-$(PKG)_DEPS_$(BUILD) := autotools gettext libiconv zlib
+$(PKG)_DEPS_$(BUILD) := autotools gettext libffi libiconv zlib
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'https://git.gnome.org/browse/glib/refs/tags' | \

src/libffi.mk

@@ -10,16 +10,28 @@ $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://www.mirrorservice.org/sites/sourceware.org/pub/$(PKG)/$($(PKG)_FILE)
 $(PKG)_URL_2    := https://sourceware.org/pub/$(PKG)/$($(PKG)_FILE)
+$(PKG)_TARGETS  := $(BUILD) $(MXE_TARGETS)
 $(PKG)_DEPS     := cc
 
+$(PKG)_DEPS_$(BUILD) :=
+
 define $(PKG)_BUILD
-    cd '$(1)' && ./configure \
+    # build and install the library
+    cd '$(BUILD_DIR)' && $(SOURCE_DIR)/configure \
         $(MXE_CONFIGURE_OPTS)
-    $(MAKE) -C '$(1)/$(TARGET)' -j '$(JOBS)'
-    $(MAKE) -C '$(1)/$(TARGET)' -j 1 install
+    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
+    $(MAKE) -C '$(BUILD_DIR)' -j 1 install
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -std=c99 -pedantic \
         '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-libffi.exe' \
         `'$(TARGET)-pkg-config' libffi --cflags --libs`
 endef
+
+define $(PKG)_BUILD_$(BUILD)
+    # build and install the library
+    cd '$(BUILD_DIR)' && $(SOURCE_DIR)/configure \
+        $(MXE_CONFIGURE_OPTS)
+    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
+    $(MAKE) -C '$(BUILD_DIR)' -j 1 install
+endef