Merge branch 'master' of git+ssh://openadk.org/git/openadk

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:

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) \