summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-04-14 23:25:16 +0000
committerRichard Purdie <richard@openedhand.com>2008-04-14 23:25:16 +0000
commit52f94fa001d4f6d94427685e9e66032969209dd4 (patch)
treeb601f7fcebca67202f0a7a08ab0e8cb926baaa7b /meta
parent993b552e4034921b2ac9d761b687a39024ac9dcb (diff)
downloadopenembedded-core-52f94fa001d4f6d94427685e9e66032969209dd4.tar.gz
openembedded-core-52f94fa001d4f6d94427685e9e66032969209dd4.tar.bz2
openembedded-core-52f94fa001d4f6d94427685e9e66032969209dd4.tar.xz
openembedded-core-52f94fa001d4f6d94427685e9e66032969209dd4.zip
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
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/fontconfig/fontconfig-2.4.2/configure_fix.patch16
-rw-r--r--meta/packages/fontconfig/fontconfig_2.4.2.bb5
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 000000000..feea1b36a
--- /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 6bc712b29..9632770f7 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"