summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2008-06-03 08:09:10 +0000
committerKoen Kooi <koen@openembedded.org>2008-06-03 08:09:10 +0000
commite3e5b01b35f9390ebbb9e533e9f18473f840ae3e (patch)
treea99c27f7c2c38820f5bac40ae3c730080286485e
parent058134c9caadcd2353eb49714fbfec9efb725edb (diff)
fontconfig: fix configure
-rw-r--r--packages/fontconfig/fontconfig-2.4.1/.mtn2git_empty0
-rw-r--r--packages/fontconfig/fontconfig-2.4.1/configure_fix.patch14
-rw-r--r--packages/fontconfig/fontconfig_2.4.1.bb5
3 files changed, 17 insertions, 2 deletions
diff --git a/packages/fontconfig/fontconfig-2.4.1/.mtn2git_empty b/packages/fontconfig/fontconfig-2.4.1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/fontconfig/fontconfig-2.4.1/.mtn2git_empty
diff --git a/packages/fontconfig/fontconfig-2.4.1/configure_fix.patch b/packages/fontconfig/fontconfig-2.4.1/configure_fix.patch
new file mode 100644
index 0000000000..6d6fa25b5a
--- /dev/null
+++ b/packages/fontconfig/fontconfig-2.4.1/configure_fix.patch
@@ -0,0 +1,14 @@
+Libtool 2.2.2 requires this is used with AC_SUBST
+
+RP - 14/4/08
+
+--- /tmp/configure.in 2008-06-02 15:21:22.254641651 +0200
++++ fontconfig-2.4.1/configure.in 2008-06-02 15:21:48.485061892 +0200
+@@ -46,6 +46,7 @@
+ AC_SUBST(LT_CURRENT)
+ AC_SUBST(LT_REVISION)
+ LT_AGE=1
++AC_SUBST(LT_AGE)
+
+ LT_VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
+ AC_SUBST(LT_VERSION_INFO)
diff --git a/packages/fontconfig/fontconfig_2.4.1.bb b/packages/fontconfig/fontconfig_2.4.1.bb
index 0e6e008f42..c1d861cfb9 100644
--- a/packages/fontconfig/fontconfig_2.4.1.bb
+++ b/packages/fontconfig/fontconfig_2.4.1.bb
@@ -1,8 +1,9 @@
require fontconfig.inc
-PR = "r2"
+PR = "r3"
-SRC_URI += "https://stage.maemo.org/svn/maemo/projects/haf/trunk/fontconfig/device_symbols.h"
+SRC_URI += "https://stage.maemo.org/svn/maemo/projects/haf/trunk/fontconfig/device_symbols.h \
+ file://configure_fix.patch;patch=1 "
EXTRA_OECONF += " --with-arch=${HOST_ARCH}"