diff options
| author | Tony Theodore <tonyt@logyst.com> | 2017-10-26 06:29:23 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2017-10-26 09:15:09 (GMT) |
| commit | 27ffd10c5dfc4a7b4b042529b2bcbad16e72e4f1 (patch) | |
| tree | 73bb48c1bc222c1841c87c314915e8f10f57fd0f /plugins | |
| parent | 994ad47302e8811614b7eb49fc05234942b95b89 (diff) | |
| download | mxe-27ffd10c5dfc4a7b4b042529b2bcbad16e72e4f1.zip mxe-27ffd10c5dfc4a7b4b042529b2bcbad16e72e4f1.tar.gz mxe-27ffd10c5dfc4a7b4b042529b2bcbad16e72e4f1.tar.bz2 | |
glib: refactor native tools
fixes #1934
The method of symlinks to native tools fails when glib versions drift
too far apart - the obvious solution would be to update more frequently,
but glib (and downstream friends) are always difficult to update.
This set of changes:
- always builds tools on linux
- builds tools only once
- uses pre-built packages for darwin
- is untested on freebsd
Diffstat (limited to 'plugins')
| l--------- | plugins/native/darwin/glib2-macports.mk | 1 | ||||
| -rw-r--r-- | plugins/native/gettext.mk | 15 | ||||
| -rw-r--r-- | plugins/native/glib2-macports.mk | 22 | ||||
| l--------- | plugins/native/jessie/gettext.mk | 1 | ||||
| l--------- | plugins/native/jessie/libiconv.mk | 1 | ||||
| -rw-r--r-- | plugins/native/libiconv.mk | 14 | ||||
| l--------- | plugins/native/trusty/gettext.mk | 1 | ||||
| l--------- | plugins/native/trusty/libiconv.mk | 1 | ||||
| l--------- | plugins/native/wheezy/gettext.mk | 1 | ||||
| l--------- | plugins/native/wheezy/libiconv.mk | 1 |
10 files changed, 23 insertions, 35 deletions
diff --git a/plugins/native/darwin/glib2-macports.mk b/plugins/native/darwin/glib2-macports.mk new file mode 120000 index 0000000..da39c4a --- /dev/null +++ b/plugins/native/darwin/glib2-macports.mk @@ -0,0 +1 @@ +../glib2-macports.mk
\ No newline at end of file diff --git a/plugins/native/gettext.mk b/plugins/native/gettext.mk deleted file mode 100644 index ea6edcb..0000000 --- a/plugins/native/gettext.mk +++ /dev/null @@ -1,15 +0,0 @@ -# This file is part of MXE. See LICENSE.md for licensing information. - -PKG := gettext -$(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS) -$(PKG)_DEPS_$(BUILD) := libiconv - -define $(PKG)_BUILD_$(BUILD) - mkdir '$(1).build' - cd '$(1).build' && '$(1)/configure' \ - --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared \ - --with-included-libxml - $(MAKE) -C '$(1).build' -j '$(JOBS)' man1_MANS= - $(MAKE) -C '$(1).build' -j 1 install man1_MANS= -endef diff --git a/plugins/native/glib2-macports.mk b/plugins/native/glib2-macports.mk new file mode 100644 index 0000000..536fd00 --- /dev/null +++ b/plugins/native/glib2-macports.mk @@ -0,0 +1,22 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +PKG := glib2-macports +$(PKG)_WEBSITE := packages.macports.org +$(PKG)_DESCR := glib2 pre-built macports package +$(PKG)_IGNORE := +$(PKG)_VERSION := 2.50.3 +$(PKG)_CHECKSUM := b7327d69c8a32d2f4ec4e885c0de189618ca6cd54999c62d1de5d37d78c515cd +$(PKG)_SUBDIR := . +$(PKG)_FILE := glib2-$($(PKG)_VERSION)_0.darwin_16.x86_64.tbz2 +$(PKG)_URL := https://packages.macports.org/glib2/glib2-$($(PKG)_VERSION)_0.darwin_16.x86_64.tbz2 +$(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) +endef diff --git a/plugins/native/jessie/gettext.mk b/plugins/native/jessie/gettext.mk deleted file mode 120000 index 6314aff..0000000 --- a/plugins/native/jessie/gettext.mk +++ /dev/null @@ -1 +0,0 @@ -../gettext.mk
\ No newline at end of file diff --git a/plugins/native/jessie/libiconv.mk b/plugins/native/jessie/libiconv.mk deleted file mode 120000 index 629a668..0000000 --- a/plugins/native/jessie/libiconv.mk +++ /dev/null @@ -1 +0,0 @@ -../libiconv.mk
\ No newline at end of file diff --git a/plugins/native/libiconv.mk b/plugins/native/libiconv.mk deleted file mode 100644 index 922739a..0000000 --- a/plugins/native/libiconv.mk +++ /dev/null @@ -1,14 +0,0 @@ -# This file is part of MXE. See LICENSE.md for licensing information. - -PKG := libiconv -$(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS) -$(PKG)_DEPS_$(BUILD) := - -define $(PKG)_BUILD_$(BUILD) - mkdir '$(1).build' - cd '$(1).build' && '$(1)/configure' \ - --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared - $(MAKE) -C '$(1).build' -j '$(JOBS)' man1_MANS= - $(MAKE) -C '$(1).build' -j 1 install man1_MANS= -endef diff --git a/plugins/native/trusty/gettext.mk b/plugins/native/trusty/gettext.mk deleted file mode 120000 index 6314aff..0000000 --- a/plugins/native/trusty/gettext.mk +++ /dev/null @@ -1 +0,0 @@ -../gettext.mk
\ No newline at end of file diff --git a/plugins/native/trusty/libiconv.mk b/plugins/native/trusty/libiconv.mk deleted file mode 120000 index 629a668..0000000 --- a/plugins/native/trusty/libiconv.mk +++ /dev/null @@ -1 +0,0 @@ -../libiconv.mk
\ No newline at end of file diff --git a/plugins/native/wheezy/gettext.mk b/plugins/native/wheezy/gettext.mk deleted file mode 120000 index 6314aff..0000000 --- a/plugins/native/wheezy/gettext.mk +++ /dev/null @@ -1 +0,0 @@ -../gettext.mk
\ No newline at end of file diff --git a/plugins/native/wheezy/libiconv.mk b/plugins/native/wheezy/libiconv.mk deleted file mode 120000 index 629a668..0000000 --- a/plugins/native/wheezy/libiconv.mk +++ /dev/null @@ -1 +0,0 @@ -../libiconv.mk
\ No newline at end of file |