From 503659533a695a94a1591c3803080544f12e9a35 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 16 Jun 2014 18:14:43 +0200
Subject: fix HOST_STYLE stuff, openjdk7 compile problems fixed

---
 package/freetype/Makefile                             |  3 ++-
 .../freetype/patches/patch-builds_unix_freetype2_in   | 19 -------------------
 2 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 package/freetype/patches/patch-builds_unix_freetype2_in

(limited to 'package/freetype')

diff --git a/package/freetype/Makefile b/package/freetype/Makefile
index 5435d1fdf..472d401e9 100644
--- a/package/freetype/Makefile
+++ b/package/freetype/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:=		cafe9f210e45360279c730d27bf071e9
 PKG_DESCR:=		free, high-quality and portable font engine
 PKG_SECTION:=		libs/fonts
 PKG_DEPENDS:=		zlib
-PKG_BUILDDEP:=		zlib freetype-host
+PKG_BUILDDEP:=		zlib
 PKG_URL:=		http://www.freetype.org/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=freetype/}
 PKG_LIBNAME:=		libfreetype
@@ -24,6 +24,7 @@ include ${TOPDIR}/mk/package.mk
 $(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+=	--with-zlib \
 			--without-png \
 			--without-bzip2
diff --git a/package/freetype/patches/patch-builds_unix_freetype2_in b/package/freetype/patches/patch-builds_unix_freetype2_in
deleted file mode 100644
index c4d32d67e..000000000
--- a/package/freetype/patches/patch-builds_unix_freetype2_in
+++ /dev/null
@@ -1,19 +0,0 @@
---- freetype-2.5.3.orig/builds/unix/freetype2.in	2014-03-02 18:00:45.527427412 +0100
-+++ freetype-2.5.3/builds/unix/freetype2.in	2014-05-14 18:39:37.626952859 +0200
-@@ -1,7 +1,7 @@
- prefix="%prefix%"
--exec_prefix="%exec_prefix%"
--libdir="%libdir%"
--includedir="%includedir%/freetype2"
-+exec_prefix="${prefix}"
-+libdir="${prefix}/lib"
-+includedir="${prefix}/include"
- 
- Name: FreeType 2
- URL: http://freetype.org
-@@ -11,4 +11,4 @@ Requires:
- Requires.private: %REQUIRES_PRIVATE%
- Libs: -L${libdir} -lfreetype
- Libs.private: %LIBS_PRIVATE%
--Cflags: -I${includedir}
-+Cflags: -I${includedir} -I${includedir}/freetype2
-- 
cgit v1.2.3