d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gettext libiconv: refactor darwin builds

This commit is contained in:
Tony Theodore 2018-02-28 18:38:26 +11:00
parent 9f9e0bbb76
commit f4751046f7
4 changed files with 36 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/native/darwin/overrides.mk
View File

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

19
src/gettext.mk
View File

@ -32,10 +32,27 @@ define $(PKG)_BUILD
$(MAKE) -C '$(1)/gettext-runtime/intl' -j '$(JOBS)' install
endef
define $(PKG)_BUILD_$(BUILD)
define $(PKG)_BUILD_NATIVE
# 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
define $(PKG)_BUILD_DARWIN
# causes issues with other packages so use different prefix
# but install *.m4 files to standard /share
cd '$(BUILD_DIR)' && $(SOURCE_DIR)/configure \
$(MXE_CONFIGURE_OPTS) \
--prefix='$(PREFIX)/$(TARGET).gnu' \
--datarootdir='$(PREFIX)/$(TARGET)/share'
$(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' $(MXE_DISABLE_DOCS)
$(MAKE) -C '$(BUILD_DIR)' -j 1 install $(MXE_DISABLE_DOCS)
endef
define $(PKG)_BUILD_$(BUILD)
$(if $(findstring darwin, $(BUILD)), \
$($(PKG)_BUILD_DARWIN), \
$($(PKG)_BUILD_NATIVE))
endef

22
src/glib.mk
View File

@ -23,22 +23,6 @@ endef
define $(PKG)_BUILD_DARWIN
# native build for glib-tools
# libiconv/gettext cause issues with other packages so build inline
mkdir '$(BUILD_DIR).src'
$(call PREPARE_PKG_SOURCE,libiconv,$(BUILD_DIR).src)
cd '$(BUILD_DIR).src/$(libiconv_SUBDIR)' && ./configure \
$(MXE_CONFIGURE_OPTS) \
--prefix='$(BUILD_DIR).usr'
$(MAKE) -C '$(BUILD_DIR).src/$(libiconv_SUBDIR)' -j '$(JOBS)' $(MXE_DISABLE_DOCS)
$(MAKE) -C '$(BUILD_DIR).src/$(libiconv_SUBDIR)' -j 1 install $(MXE_DISABLE_DOCS)
$(call PREPARE_PKG_SOURCE,gettext,$(BUILD_DIR).src)
cd '$(BUILD_DIR).src/$(gettext_SUBDIR)' && ./configure \
$(MXE_CONFIGURE_OPTS) \
--prefix='$(BUILD_DIR).usr'
$(MAKE) -C '$(BUILD_DIR).src/$(gettext_SUBDIR)' -j '$(JOBS)' $(MXE_DISABLE_DOCS)
$(MAKE) -C '$(BUILD_DIR).src/$(gettext_SUBDIR)' -j 1 install $(MXE_DISABLE_DOCS)
cd '$(SOURCE_DIR)' && NOCONFIGURE=true ./autogen.sh
cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/configure' \
$(MXE_CONFIGURE_OPTS) \
@ -52,8 +36,8 @@ define $(PKG)_BUILD_DARWIN
--disable-libmount \
--with-pcre=internal \
PKG_CONFIG='$(PREFIX)/$(TARGET)/bin/pkgconf' \
CPPFLAGS='-I$(BUILD_DIR).usr/include' \
LDFLAGS='-L$(BUILD_DIR).usr/lib'
CPPFLAGS='-I$(PREFIX)/$(TARGET).gnu/include' \
LDFLAGS='-L$(PREFIX)/$(TARGET).gnu/lib'
$(MAKE) -C '$(BUILD_DIR)/glib' -j '$(JOBS)'
$(MAKE) -C '$(BUILD_DIR)/gthread' -j '$(JOBS)'
$(MAKE) -C '$(BUILD_DIR)/gmodule' -j '$(JOBS)'
@ -97,8 +81,6 @@ define $(PKG)_BUILD_NATIVE
endef
define $(PKG)_BUILD_$(BUILD)
# glib tools need to be close to glib-cross version.
# easy to build on linux, but error-prone on darwin (and freebsd?)
$(if $(findstring darwin, $(BUILD)), \
$($(PKG)_BUILD_DARWIN), \
$($(PKG)_BUILD_NATIVE))

17
src/libiconv.mk
View File

@ -34,10 +34,25 @@ define $(PKG)_BUILD
rm -f '$(PREFIX)/$(TARGET)/lib/charset.alias'
endef
define $(PKG)_BUILD_$(BUILD)
define $(PKG)_BUILD_NATIVE
# 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
define $(PKG)_BUILD_DARWIN
# causes issues with other packages so use different prefix
cd '$(BUILD_DIR)' && $(SOURCE_DIR)/configure \
$(MXE_CONFIGURE_OPTS) \
--prefix='$(PREFIX)/$(TARGET).gnu'
$(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' $(MXE_DISABLE_DOCS)
$(MAKE) -C '$(BUILD_DIR)' -j 1 install $(MXE_DISABLE_DOCS)
endef
define $(PKG)_BUILD_$(BUILD)
$(if $(findstring darwin, $(BUILD)), \
$($(PKG)_BUILD_DARWIN), \
$($(PKG)_BUILD_NATIVE))
endef