diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-31 16:04:59 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-31 16:04:59 +0100 |
| commit | f5ce6f0a51261cc405556467632aac0ddc77f74c (patch) | |
| tree | 52ae68e4442b596dfe3cc61c5d563252f3e1ac57 | |
| parent | 8642d5d1d310f83c2717559a6829a710f0d8b396 (diff) | |
| parent | 86e8cf36b2a60da11121a814f65a28572943b72b (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | package/freetype/Makefile | 1 | ||||
| -rw-r--r-- | toolchain/gmp/Makefile | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/package/freetype/Makefile b/package/freetype/Makefile index 492adb046..55fdd98af 100644 --- a/package/freetype/Makefile +++ b/package/freetype/Makefile @@ -27,6 +27,7 @@ $(eval $(call HOST_template,LIBFREETYPE,libfreetype,${PKG_VERSION}-${PKG_RELEASE $(eval $(call PKG_template,LIBFREETYPE,libfreetype,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) HOST_STYLE:= auto +HOST_CONFIGURE_ARGS+= --without-png CONFIGURE_ARGS+= --without-png libfreetype-install: diff --git a/toolchain/gmp/Makefile b/toolchain/gmp/Makefile index 22e5070be..33982ed17 100644 --- a/toolchain/gmp/Makefile +++ b/toolchain/gmp/Makefile @@ -12,6 +12,9 @@ endif $(WRKBUILD)/.headers: $(WRKBUILD)/.configured: +ifneq ($(OStype),Darwin) + (cd $(WRKBUILD); cp configfsf.guess config.guess) +endif (cd $(WRKBUILD); \ ./configure \ --prefix=$(STAGING_HOST_DIR) \ |