summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/freetype/freetype-2.3.6/.mtn2git_empty0
-rw-r--r--packages/freetype/freetype-2.3.6/fix-configure.patch13
-rw-r--r--packages/freetype/freetype_2.3.6.bb11
3 files changed, 19 insertions, 5 deletions
diff --git a/packages/freetype/freetype-2.3.6/.mtn2git_empty b/packages/freetype/freetype-2.3.6/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/freetype/freetype-2.3.6/.mtn2git_empty
diff --git a/packages/freetype/freetype-2.3.6/fix-configure.patch b/packages/freetype/freetype-2.3.6/fix-configure.patch
new file mode 100644
index 0000000000..ecd96738d4
--- /dev/null
+++ b/packages/freetype/freetype-2.3.6/fix-configure.patch
@@ -0,0 +1,13 @@
+Index: freetype-2.3.6/builds/unix/configure.ac
+===================================================================
+--- freetype-2.3.6.orig/builds/unix/configure.ac
++++ freetype-2.3.6/builds/unix/configure.ac
+@@ -506,8 +506,6 @@ AC_SUBST([FT2_EXTRA_LIBS])
+ AC_SUBST([SYSTEM_ZLIB])
+
+
+-LT_INIT(win32-dll)
+-
+ AC_SUBST([hardcode_libdir_flag_spec])
+ AC_SUBST([wl])
+ AC_SUBST([build_libtool_libs])
diff --git a/packages/freetype/freetype_2.3.6.bb b/packages/freetype/freetype_2.3.6.bb
index 1333997775..516354ad23 100644
--- a/packages/freetype/freetype_2.3.6.bb
+++ b/packages/freetype/freetype_2.3.6.bb
@@ -3,15 +3,16 @@ SECTION = "libs"
LICENSE = "freetype"
PR = "r0"
-SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
- file://no-hardcode.patch;patch=1 \
- "
-
+SRC_URI = "\
+ ${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
+ file://no-hardcode.patch;patch=1 \
+ file://fix-configure.patch;patch=1 \
+"
S = "${WORKDIR}/freetype-${PV}"
inherit autotools pkgconfig binconfig
-LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool"
+LIBTOOL = "${HOST_SYS}-libtool"
EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'"
EXTRA_OECONF = "--without-zlib"