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 /src/libiconv.mk | |
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 'src/libiconv.mk')
-rw-r--r-- | src/libiconv.mk | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/libiconv.mk b/src/libiconv.mk index 39eee94..f1b5c46 100644 --- a/src/libiconv.mk +++ b/src/libiconv.mk @@ -9,6 +9,9 @@ $(PKG)_SUBDIR := libiconv-$($(PKG)_VERSION) $(PKG)_FILE := libiconv-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://ftp.gnu.org/gnu/libiconv/$($(PKG)_FILE) $(PKG)_DEPS := gcc +$(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS) + +$(PKG)_DEPS_$(BUILD) := define $(PKG)_UPDATE $(WGET) -q -O- 'https://www.gnu.org/software/libiconv/' | \ @@ -32,9 +35,9 @@ define $(PKG)_BUILD endef define $(PKG)_BUILD_$(BUILD) - mkdir '$(1).build' - cd '$(1).build' && '$(1)/configure' \ - --prefix='$(PREFIX)/$(TARGET)' - $(MAKE) -C '$(1).build' -j '$(JOBS)' man1_MANS= - $(MAKE) -C '$(1).build' -j 1 install man1_MANS= + # build and install the library + cd '$(BUILD_DIR)' && $(SOURCE_DIR)/configure \ + $(MXE_CONFIGURE_OPTS) + $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' $(MXE_DISABLE_DOCS) + $(MAKE) -C '$(BUILD_DIR)' -j 1 install $(MXE_DISABLE_DOCS) endef |