fontconfig: Tweak configure for libtool 2.2.2

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4268 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 19 insertions, 2 deletions

diff --git a/meta/packages/fontconfig/fontconfig-2.4.2/configure_fix.patch b/meta/packages/fontconfig/fontconfig-2.4.2/configure_fix.patch
new file mode 100644
index 0000000000..feea1b36a8
--- /dev/null
+++ b/meta/packages/fontconfig/fontconfig-2.4.2/configure_fix.patch
@@ -0,0 +1,16 @@
+Libtool 2.2.2 requires this is used with AC_SUBST
+
+RP - 14/4/08
+
+Index: fontconfig-2.4.2/configure.in
+===================================================================
+--- fontconfig-2.4.2.orig/configure.in  2008-04-15 00:20:54.000000000 +0100
++++ fontconfig-2.4.2/configure.in       2008-04-14 14:37:40.000000000 +0100
+@@ -46,6 +46,7 @@
+ AC_SUBST(LT_CURRENT)
+ AC_SUBST(LT_REVISION)
+ LT_AGE=2
++AC_SUBST(LT_AGE)
+ 
+ LT_VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
+ AC_SUBST(LT_VERSION_INFO)
diff --git a/meta/packages/fontconfig/fontconfig_2.4.2.bb b/meta/packages/fontconfig/fontconfig_2.4.2.bb
index 6bc712b296..9632770f79 100644
--- a/meta/packages/fontconfig/fontconfig_2.4.2.bb
+++ b/meta/packages/fontconfig/fontconfig_2.4.2.bb
@@ -3,9 +3,10 @@ LICENSE = "BSD"
 DESCRIPTION = "A library for configuring and customizing font access."
 DEPENDS = "expat freetype freetype-native zlib"
 
-SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz"
+SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
+           file://configure_fix.patch;patch=1"
 
-PR = "r0"
+PR = "r9"
 
 PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils "
 FILES_fontconfig-utils-dbg = "${bindir}/*.dbg"