diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-06-16 18:14:43 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-06-16 18:14:54 +0200 |
| commit | 503659533a695a94a1591c3803080544f12e9a35 (patch) | |
| tree | 4252d066e70ac971eac81e60beb82321de210a7d /package/freetype | |
| parent | 224199c2a01bb660242688aca506373e40b79775 (diff) | |
fix HOST_STYLE stuff, openjdk7 compile problems fixed
Diffstat (limited to 'package/freetype')
| -rw-r--r-- | package/freetype/Makefile | 3 | ||||
| -rw-r--r-- | package/freetype/patches/patch-builds_unix_freetype2_in | 19 |
2 files changed, 2 insertions, 20 deletions
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 |