diff options
| author | Tony Theodore <tonyt@logyst.com> | 2018-03-03 06:32:45 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-03 06:32:45 (GMT) |
| commit | 630f0b4e10250ac873081a75ecb54596c5ba3cc4 (patch) | |
| tree | 55ba3f7cd7ee6fd29a5dc7931e4da102d8f84317 /src | |
| parent | 35bee25b0be988a744379670291db5e2b6b89d91 (diff) | |
| parent | 8bfb79d4238491c79ed3184e34a57b040149a7b4 (diff) | |
| download | mxe-630f0b4e10250ac873081a75ecb54596c5ba3cc4.zip mxe-630f0b4e10250ac873081a75ecb54596c5ba3cc4.tar.gz mxe-630f0b4e10250ac873081a75ecb54596c5ba3cc4.tar.bz2 | |
Merge pull request #2061 from flirc/master
fixes remaining compile issues on darwin by using system perl
Diffstat (limited to 'src')
| -rw-r--r-- | src/gtksourceview.mk | 3 | ||||
| -rw-r--r-- | src/libgda.mk | 1 | ||||
| -rw-r--r-- | src/libsoup.mk | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/gtksourceview.mk b/src/gtksourceview.mk index 1c871c6..a7e8a22 100644 --- a/src/gtksourceview.mk +++ b/src/gtksourceview.mk @@ -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 diff --git a/src/libgda.mk b/src/libgda.mk index 9be0ddb..2d575bf 100644 --- a/src/libgda.mk +++ b/src/libgda.mk @@ -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= diff --git a/src/libsoup.mk b/src/libsoup.mk index 2aa71ce..4c6c3c1 100644 --- a/src/libsoup.mk +++ b/src/libsoup.mk @@ -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 |