mirror of https://git.wownero.com/dsc/mxe.git
Merge pull request #2061 from flirc/master
fixes remaining compile issues on darwin by using system perl
This commit is contained in:
commit
630f0b4e10
|
@ -26,7 +26,8 @@ define $(PKG)_BUILD
|
|||
--prefix='$(PREFIX)/$(TARGET)' \
|
||||
--disable-gtk-doc \
|
||||
GLIB_GENMARSHAL='$(PREFIX)/$(TARGET)/bin/glib-genmarshal' \
|
||||
GLIB_MKENUMS='$(PREFIX)/$(TARGET)/bin/glib-mkenums'
|
||||
GLIB_MKENUMS='$(PREFIX)/$(TARGET)/bin/glib-mkenums' \
|
||||
$(shell [ `uname -s` == Darwin ] && echo "INTLTOOL_PERL=/usr/bin/perl")
|
||||
$(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
|
||||
$(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
|
||||
endef
|
||||
|
|
|
@ -33,6 +33,7 @@ define $(PKG)_BUILD
|
|||
--without-java \
|
||||
--enable-binreloc \
|
||||
--disable-crypto \
|
||||
$(shell [ `uname -s` == Darwin ] && echo "INTLTOOL_PERL=/usr/bin/perl") \
|
||||
GLIB_GENMARSHAL='$(PREFIX)/$(TARGET)/bin/glib-genmarshal'
|
||||
$(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
|
||||
$(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
|
||||
|
|
|
@ -19,7 +19,8 @@ define $(PKG)_BUILD
|
|||
$(MXE_CONFIGURE_OPTS) \
|
||||
--disable-vala \
|
||||
--without-apache-httpd \
|
||||
--without-gssapi
|
||||
--without-gssapi \
|
||||
$(shell [ `uname -s` == Darwin ] && echo "INTLTOOL_PERL=/usr/bin/perl")
|
||||
$(MAKE) -C '$(BUILD_DIR)' -j $(JOBS)
|
||||
$(MAKE) -C '$(BUILD_DIR)' -j 1 install
|
||||
|
||||
|
|
Loading…
Reference in New Issue