summaryrefslogtreecommitdiff
path: root/recipes
diff options
context:
space:
mode:
Diffstat (limited to 'recipes')
-rw-r--r--recipes/freetype/freetype-2.3.12/fix-configure.patch4
-rw-r--r--recipes/freetype/freetype-2.3.12/libtool-tag.patch12
-rw-r--r--recipes/freetype/freetype_2.3.12.bb2
3 files changed, 9 insertions, 9 deletions
diff --git a/recipes/freetype/freetype-2.3.12/fix-configure.patch b/recipes/freetype/freetype-2.3.12/fix-configure.patch
index 78e76ebce7..ecd96738d4 100644
--- a/recipes/freetype/freetype-2.3.12/fix-configure.patch
+++ b/recipes/freetype/freetype-2.3.12/fix-configure.patch
@@ -4,8 +4,8 @@ Index: freetype-2.3.6/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])
diff --git a/recipes/freetype/freetype-2.3.12/libtool-tag.patch b/recipes/freetype/freetype-2.3.12/libtool-tag.patch
index 356a256e4c..2f096cdd46 100644
--- a/recipes/freetype/freetype-2.3.12/libtool-tag.patch
+++ b/recipes/freetype/freetype-2.3.12/libtool-tag.patch
@@ -1,16 +1,16 @@
---- freetype-2.3.6/builds/unix/unix-cc.in
-+++ freetype-2.3.6/builds/unix/unix-cc.in
-@@ -88,7 +88,7 @@
+--- freetype-2.3.6/builds/unix/unix-cc.in
++++ freetype-2.3.6/builds/unix/unix-cc.in
+@@ -88,7 +88,7 @@
#
#
CCraw := $(CC)
-CC := $(LIBTOOL) --mode=compile $(CCraw)
+CC := $(LIBTOOL) --tag=CC --mode=compile $(CCraw)
-
+
# Linker flags.
#
-@@ -105,7 +105,7 @@
-
+@@ -105,7 +105,7 @@
+
# Library linking
#
-LINK_LIBRARY = $(LIBTOOL) --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \
diff --git a/recipes/freetype/freetype_2.3.12.bb b/recipes/freetype/freetype_2.3.12.bb
index 6056760e13..eda6ee5660 100644
--- a/recipes/freetype/freetype_2.3.12.bb
+++ b/recipes/freetype/freetype_2.3.12.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Freetype font rendering library"
SECTION = "libs"
LICENSE = "freetype"
-PR = "r1"
+PR = "r2"
DEPENDS = "zlib"
SRC_URI = "\