diff options
| author | Tony Theodore <tonyt@logyst.com> | 2017-10-29 23:42:47 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2017-10-30 03:16:01 (GMT) |
| commit | c7714c31113429de7357767ab4e5e057c65f8f0c (patch) | |
| tree | 458c3b1e31aa691e81b97491b0b2ac36261631fe /plugins | |
| parent | 820fd58157ef62c42bc2dcb8856113a031211cd4 (diff) | |
| download | mxe-c7714c31113429de7357767ab4e5e057c65f8f0c.zip mxe-c7714c31113429de7357767ab4e5e057c65f8f0c.tar.gz mxe-c7714c31113429de7357767ab4e5e057c65f8f0c.tar.bz2 | |
native plugin fixups
- gettext requires recent autotools
- add for Ubuntu 14.04 (trusty) - fixes #1892
- add deps for Debian Jessie and Wheezy
- libtool is built for prior Debian/Ubuntu, remove from docs
- tidy up darwin overrides
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/native/darwin/overrides.mk | 7 | ||||
| -rw-r--r-- | plugins/native/gettext-deps.mk | 4 | ||||
| -rw-r--r-- | plugins/native/glib2-macports.mk | 4 | ||||
| l--------- | plugins/native/jessie/gettext-deps.mk | 1 | ||||
| l--------- | plugins/native/trusty/autoconf.mk | 1 | ||||
| l--------- | plugins/native/trusty/automake.mk | 1 | ||||
| l--------- | plugins/native/trusty/gettext-deps.mk | 1 | ||||
| l--------- | plugins/native/trusty/libtool.mk | 1 | ||||
| l--------- | plugins/native/trusty/m4.mk | 1 | ||||
| l--------- | plugins/native/wheezy/gettext-deps.mk | 1 |
10 files changed, 18 insertions, 4 deletions
diff --git a/plugins/native/darwin/overrides.mk b/plugins/native/darwin/overrides.mk new file mode 100644 index 0000000..a34ed06 --- /dev/null +++ b/plugins/native/darwin/overrides.mk @@ -0,0 +1,7 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +# additional modifications to control native builds +glib_DEPS_$(BUILD) := glib2-macports +gettext_DEPS_$(BUILD) := +gettext_BUILD_$(BUILD) := +libiconv_BUILD_$(BUILD) := diff --git a/plugins/native/gettext-deps.mk b/plugins/native/gettext-deps.mk new file mode 100644 index 0000000..e0d0fbe --- /dev/null +++ b/plugins/native/gettext-deps.mk @@ -0,0 +1,4 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +# native build of gettext requires recent autotools +gettext_DEPS_$(BUILD) := $(gettext_DEPS_$(BUILD)) libtool diff --git a/plugins/native/glib2-macports.mk b/plugins/native/glib2-macports.mk index 536fd00..6e8ae04 100644 --- a/plugins/native/glib2-macports.mk +++ b/plugins/native/glib2-macports.mk @@ -12,10 +12,6 @@ $(PKG)_URL := https://packages.macports.org/glib2/glib2-$($(PKG)_VERSION)_0 $(PKG)_DEPS := $(PKG)_TARGETS := $(BUILD) -glib_DEPS_$(BUILD) := $(PKG) -gettext_BUILD_$(BUILD) := -libiconv_BUILD_$(BUILD) := - define $(PKG)_UPDATE echo 'manually update glib2-macports as necessary' >&2; echo $(glib2-macports_VERSION) diff --git a/plugins/native/jessie/gettext-deps.mk b/plugins/native/jessie/gettext-deps.mk new file mode 120000 index 0000000..5426ef9 --- /dev/null +++ b/plugins/native/jessie/gettext-deps.mk @@ -0,0 +1 @@ +../gettext-deps.mk
\ No newline at end of file diff --git a/plugins/native/trusty/autoconf.mk b/plugins/native/trusty/autoconf.mk new file mode 120000 index 0000000..8bfe07e --- /dev/null +++ b/plugins/native/trusty/autoconf.mk @@ -0,0 +1 @@ +../autoconf.mk
\ No newline at end of file diff --git a/plugins/native/trusty/automake.mk b/plugins/native/trusty/automake.mk new file mode 120000 index 0000000..5bc30c0 --- /dev/null +++ b/plugins/native/trusty/automake.mk @@ -0,0 +1 @@ +../automake.mk
\ No newline at end of file diff --git a/plugins/native/trusty/gettext-deps.mk b/plugins/native/trusty/gettext-deps.mk new file mode 120000 index 0000000..5426ef9 --- /dev/null +++ b/plugins/native/trusty/gettext-deps.mk @@ -0,0 +1 @@ +../gettext-deps.mk
\ No newline at end of file diff --git a/plugins/native/trusty/libtool.mk b/plugins/native/trusty/libtool.mk new file mode 120000 index 0000000..9b5568f --- /dev/null +++ b/plugins/native/trusty/libtool.mk @@ -0,0 +1 @@ +../libtool.mk
\ No newline at end of file diff --git a/plugins/native/trusty/m4.mk b/plugins/native/trusty/m4.mk new file mode 120000 index 0000000..fe3aad4 --- /dev/null +++ b/plugins/native/trusty/m4.mk @@ -0,0 +1 @@ +../m4.mk
\ No newline at end of file diff --git a/plugins/native/wheezy/gettext-deps.mk b/plugins/native/wheezy/gettext-deps.mk new file mode 120000 index 0000000..5426ef9 --- /dev/null +++ b/plugins/native/wheezy/gettext-deps.mk @@ -0,0 +1 @@ +../gettext-deps.mk
\ No newline at end of file |