mirror of https://git.wownero.com/dsc/mxe.git
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
This commit is contained in:
parent
820fd58157
commit
c7714c3111
|
@ -690,11 +690,6 @@ USE_OSGPLUGIN(<plugin2>)
|
|||
</p>
|
||||
<pre>apt-get install g++-multilib libc6-dev-i386</pre>
|
||||
|
||||
<p>
|
||||
Prior to Debian Jessie (8) or Ubuntu Utopic (14.10),
|
||||
install <code>libtool</code> instead of <code>libtool-bin</code>.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
Only the <a href="https://www.debian.org/releases/stable/">latest Debian stable series</a> is supported.
|
||||
</p>
|
||||
|
|
|
@ -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) :=
|
|
@ -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
|
|
@ -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)
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
../gettext-deps.mk
|
|
@ -0,0 +1 @@
|
|||
../autoconf.mk
|
|
@ -0,0 +1 @@
|
|||
../automake.mk
|
|
@ -0,0 +1 @@
|
|||
../gettext-deps.mk
|
|
@ -0,0 +1 @@
|
|||
../libtool.mk
|
|
@ -0,0 +1 @@
|
|||
../m4.mk
|
|
@ -0,0 +1 @@
|
|||
../gettext-deps.mk
|
|
@ -59,7 +59,7 @@ 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, $(OS_SHORT_NAME)), \
|
||||
$(if $(findstring darwin, $(BUILD)), \
|
||||
$($(PKG)_BUILD_DARWIN), \
|
||||
$($(PKG)_BUILD_NATIVE))
|
||||
endef
|
||||
|
|
Loading…
Reference in New Issue