diff options
| author | Tony Theodore <tonyt@logyst.com> | 2014-03-15 05:26:43 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2014-03-15 05:26:43 (GMT) |
| commit | 4a6757850bafe1c4425c14feb792b440cc848117 (patch) | |
| tree | 9c81f059092a979f14c1d6aedc0144fc75553379 | |
| parent | 06c18cb483299cc122e326412ffe2b93628cdacb (diff) | |
| parent | b9c3fc9cff4422cb32ef9f5e38a3c232e45ad40e (diff) | |
| download | mxe-4a6757850bafe1c4425c14feb792b440cc848117.zip mxe-4a6757850bafe1c4425c14feb792b440cc848117.tar.gz mxe-4a6757850bafe1c4425c14feb792b440cc848117.tar.bz2 | |
Merge pull request #344 from TobiX/master
Shared build for libcroco and librsvg
| -rw-r--r-- | src/libcroco.mk | 4 | ||||
| -rw-r--r-- | src/librsvg.mk | 8 |
2 files changed, 3 insertions, 9 deletions
diff --git a/src/libcroco.mk b/src/libcroco.mk index e6d9371..f291d52 100644 --- a/src/libcroco.mk +++ b/src/libcroco.mk @@ -19,9 +19,7 @@ endef define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --disable-shared \ - --prefix='$(PREFIX)/$(TARGET)' \ + $(MXE_CONFIGURE_OPTS) \ --disable-gtk-doc $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef diff --git a/src/librsvg.mk b/src/librsvg.mk index 4473ad5..4bdc193 100644 --- a/src/librsvg.mk +++ b/src/librsvg.mk @@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := abbfed10433b26e88f18fe62a9b84d48fc00b9e1 $(PKG)_SUBDIR := librsvg-$($(PKG)_VERSION) $(PKG)_FILE := librsvg-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://ftp.gnome.org/pub/GNOME/sources/librsvg/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) -$(PKG)_DEPS := gcc glib libgsf cairo pango gtk2 libcroco +$(PKG)_DEPS := gcc glib libgsf cairo pango gdk-pixbuf libcroco define $(PKG)_UPDATE $(WGET) -q -O- 'http://git.gnome.org/browse/librsvg/refs/tags' | \ @@ -18,12 +18,8 @@ endef define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ - --disable-shared \ - --prefix='$(PREFIX)/$(TARGET)' \ + $(MXE_CONFIGURE_OPTS) \ --disable-pixbuf-loader \ - --disable-gtk-theme \ --disable-gtk-doc \ --enable-introspection=no $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= |