Merge pull request #2061 from flirc/master

fixes remaining compile issues on darwin by using system perl
This commit is contained in:
Tony Theodore 2018-03-03 17:32:45 +11:00 committed by GitHub
commit 630f0b4e10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions

View File

@ -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

View File

@ -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=

View File

@ -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