Mercurial > mxe-octave
changeset 2779:6bc26fc1e74c
Merge branch 'master' of github.com:mxe/mxe
| author | Tony Theodore <tonyt@logyst.com> |
|---|---|
| date | Sat, 22 Sep 2012 22:13:25 +1000 |
| parents | 0f825b9c0d8c (current diff) daff1938f6b1 (diff) |
| children | 016ef289a545 |
| files | |
| diffstat | 4 files changed, 20 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Sat Sep 22 22:13:09 2012 +1000 +++ b/Makefile Sat Sep 22 22:13:25 2012 +1000 @@ -191,6 +191,7 @@ @echo '[done] $(1)' .PHONY: build-only-$(1) +build-only-$(1): PKG = $(1) build-only-$(1): $(if $(value $(1)_BUILD), rm -rf '$(2)'
--- a/index.html Sat Sep 22 22:13:09 2012 +1000 +++ b/index.html Sat Sep 22 22:13:25 2012 +1000 @@ -1745,7 +1745,7 @@ </tr> <tr> <td id="poppler-package">poppler</td> - <td id="poppler-version">0.20.2</td> + <td id="poppler-version">0.20.4</td> <td id="poppler-website"><a href="http://poppler.freedesktop.org/">poppler</a></td> </tr> <tr>
--- a/src/glib.mk Sat Sep 22 22:13:09 2012 +1000 +++ b/src/glib.mk Sat Sep 22 22:13:25 2012 +1000 @@ -15,8 +15,7 @@ head -1 endef -define $(PKG)_BUILD - cd '$(1)' && ./autogen.sh +define $(PKG)_NATIVE_BUILD cp -Rp '$(1)' '$(1).native' # native build of libiconv (used by glib-genmarshal) @@ -51,7 +50,23 @@ $(MAKE) -C '$(1).native/gio' -j '$(JOBS)' glib-compile-resources $(INSTALL) -m755 '$(1).native/gio/glib-compile-schemas' '$(PREFIX)/$(TARGET)/bin/' $(INSTALL) -m755 '$(1).native/gio/glib-compile-resources' '$(PREFIX)/$(TARGET)/bin/' +endef +define $(PKG)_SYMLINK + ln -sf `which glib-genmarshal` '$(PREFIX)/$(TARGET)/bin/' + ln -sf `which glib-compile-schemas` '$(PREFIX)/$(TARGET)/bin/' + ln -sf `which glib-compile-resources` '$(PREFIX)/$(TARGET)/bin/' +endef + +define $(PKG)_BUILD + cd '$(1)' && ./autogen.sh + rm -f '$(PREFIX)/$(TARGET)/bin/glib-*' + $(if $(findstring y,\ + $(shell [ -x "`which glib-genmarshal`" ] && \ + [ -x "`which glib-compile-schemas`" ] && \ + [ -x "`which glib-compile-resources`" ] && echo y)), \ + $($(PKG)_SYMLINK), \ + $($(PKG)_NATIVE_BUILD)) # cross build cd '$(1)' && ./configure \ --host='$(TARGET)' \
--- a/src/poppler.mk Sat Sep 22 22:13:09 2012 +1000 +++ b/src/poppler.mk Sat Sep 22 22:13:25 2012 +1000 @@ -3,7 +3,7 @@ PKG := poppler $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 0f745b593e764d27a0e21645e6febd6ad8ad2ab9 +$(PKG)_CHECKSUM := fd808cfcd249b7079a09a97f99ffb08db8c62b93 $(PKG)_SUBDIR := poppler-$($(PKG)_VERSION) $(PKG)_FILE := poppler-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://poppler.freedesktop.org/$($(PKG)_FILE)