From 55c488bb2947ee61e0e7d0c5900d4471f1c59ded Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Tue, 27 Feb 2018 12:15:48 +1100
Subject: libffi: build native version on darwin for glib

---
 plugins/native/darwin/libffi.mk    |  1 +
 plugins/native/darwin/overrides.mk |  2 +-
 plugins/native/libffi.mk           | 13 +++++++++++++
 src/glib.mk                        |  4 ++--
 4 files changed, 17 insertions(+), 3 deletions(-)
 create mode 120000 plugins/native/darwin/libffi.mk
 create mode 100644 plugins/native/libffi.mk

diff --git a/plugins/native/darwin/libffi.mk b/plugins/native/darwin/libffi.mk
new file mode 120000
index 0000000..b328098
--- /dev/null
+++ b/plugins/native/darwin/libffi.mk
@@ -0,0 +1 @@
+../libffi.mk
\ No newline at end of file
diff --git a/plugins/native/darwin/overrides.mk b/plugins/native/darwin/overrides.mk
index 2a2cd89..f5b45a7 100644
--- a/plugins/native/darwin/overrides.mk
+++ b/plugins/native/darwin/overrides.mk
@@ -1,6 +1,6 @@
 # This file is part of MXE. See LICENSE.md for licensing information.
 
 # additional modifications to control native builds
-glib_DEPS_$(BUILD)      :=
+glib_DEPS_$(BUILD)      := libffi zlib
 gettext_BUILD_$(BUILD)  :=
 libiconv_BUILD_$(BUILD) :=
diff --git a/plugins/native/libffi.mk b/plugins/native/libffi.mk
new file mode 100644
index 0000000..0c9b2fe
--- /dev/null
+++ b/plugins/native/libffi.mk
@@ -0,0 +1,13 @@
+# 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
diff --git a/src/glib.mk b/src/glib.mk
index 48c2596..dc482e3 100644
--- a/src/glib.mk
+++ b/src/glib.mk
@@ -51,8 +51,8 @@ define $(PKG)_BUILD_DARWIN
         --disable-dtrace \
         --disable-libmount \
         --with-pcre=internal \
-        CPPFLAGS='-I$(BUILD_DIR).usr/include' \
-        LDFLAGS='-L$(BUILD_DIR).usr/lib'
+        CPPFLAGS='-I$(BUILD_DIR).usr/include -I$(PREFIX)/$(TARGET)/include' \
+        LDFLAGS='-L$(BUILD_DIR).usr/lib -L$(PREFIX)/$(TARGET)/lib -lffi'
     $(MAKE) -C '$(BUILD_DIR)/glib'    -j '$(JOBS)'
     $(MAKE) -C '$(BUILD_DIR)/gthread' -j '$(JOBS)'
     $(MAKE) -C '$(BUILD_DIR)/gmodule' -j '$(JOBS)'
-- 
cgit v0.12