summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-04-14 23:12:37 +0000
committerRichard Purdie <richard@openedhand.com>2008-04-14 23:12:37 +0000
commit4c6ff89d2ce3ab80a7101909904c4987856ca2ac (patch)
tree2a5bdbaa6fdb174b794b7231a7161698f45de968 /meta
parentb38bc533f25bf0a6422775e81b2406241c72b9c7 (diff)
downloadpoky-4c6ff89d2ce3ab80a7101909904c4987856ca2ac.tar.gz
cario: Add fixes for libtool 2.2.2
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4265 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/cairo/cairo-1.4.14/configure_fix.patch69
-rw-r--r--meta/packages/cairo/cairo_1.4.14.bb5
2 files changed, 72 insertions, 2 deletions
diff --git a/meta/packages/cairo/cairo-1.4.14/configure_fix.patch b/meta/packages/cairo/cairo-1.4.14/configure_fix.patch
new file mode 100644
index 0000000000..04993bb0b9
--- /dev/null
+++ b/meta/packages/cairo/cairo-1.4.14/configure_fix.patch
@@ -0,0 +1,69 @@
1Libtool 2.2.2 can't cope unless the LT_ variables are marked as AC_SUBST
2as otherwise autofoo tries to expand them, fails and gets upset.
3
4You can't conditionally add AC_PROG_CXX to a configure.ac file since the
5mere mention of it triggers some internals which then get upset it if
6wasn't really called at configure time.
7
8Referring to a .cpp file in Makefiles without calling AC_PROG_CXX is
9now also a fatal error. Easiest fix is to drop the CXX stuff entirely.
10
11RP - 14/4/08
12
13Index: cairo-1.4.14/configure.in
14===================================================================
15--- cairo-1.4.14.orig/configure.in 2008-04-14 14:50:16.000000000 +0100
16+++ cairo-1.4.14/configure.in 2008-04-14 15:05:59.000000000 +0100
17@@ -23,15 +23,18 @@
18
19 # Increment if the interface has additions, changes, removals.
20 LT_CURRENT=13
21+AC_SUBST(LT_CURRENT)
22
23 # Increment any time the source changes; set to
24 # 0 if you increment CURRENT
25 LT_REVISION=7
26+AC_SUBST(LT_REVISION)
27
28 # Increment if any interfaces have been added; set to 0
29 # if any interfaces have been removed. removal has
30 # precedence over adding, so set to 0 if both happened.
31 LT_AGE=11
32+AC_SUBST(LT_AGE)
33
34 dnl ===========================================================================
35
36@@ -342,9 +345,6 @@
37 esac
38 ])
39
40-if test "x$use_beos" = "xyes"; then
41- AC_PROG_CXX
42-fi
43
44 dnl ===========================================================================
45
46Index: cairo-1.4.14/boilerplate/Makefile.am
47===================================================================
48--- cairo-1.4.14.orig/boilerplate/Makefile.am 2008-04-14 15:08:47.000000000 +0100
49+++ cairo-1.4.14/boilerplate/Makefile.am 2008-04-14 15:08:57.000000000 +0100
50@@ -9,7 +9,6 @@
51 libcairoboilerplate_la_LIBADD = $(top_builddir)/src/libcairo.la $(CAIRO_LDADD)
52
53 if CAIRO_HAS_BEOS_SURFACE
54-libcairoboilerplate_la_SOURCES += cairo-boilerplate-beos.cpp
55 libcairoboilerplate_la_SOURCES += cairo-boilerplate-beos-private.h
56 # BeOS system headers trigger this warning
57 libcairoboilerplate_la_CXXFLAGS = -Wno-multichar
58Index: cairo-1.4.14/src/Makefile.am
59===================================================================
60--- cairo-1.4.14.orig/src/Makefile.am 2008-04-14 15:08:25.000000000 +0100
61+++ cairo-1.4.14/src/Makefile.am 2008-04-14 15:08:38.000000000 +0100
62@@ -97,7 +97,6 @@
63 libcairo_beos_sources =
64 if CAIRO_HAS_BEOS_SURFACE
65 libcairo_beos_headers = cairo-beos.h
66-libcairo_beos_sources += cairo-beos-surface.cpp
67 backend_pkgconfigs += cairo-beos.pc
68
69 noinst_LTLIBRARIES = libcairo_beos.la
diff --git a/meta/packages/cairo/cairo_1.4.14.bb b/meta/packages/cairo/cairo_1.4.14.bb
index 845e14fc29..116c79810a 100644
--- a/meta/packages/cairo/cairo_1.4.14.bb
+++ b/meta/packages/cairo/cairo_1.4.14.bb
@@ -1,6 +1,7 @@
1require cairo.inc 1require cairo.inc
2 2
3SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz" 3SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
4 file://configure_fix.patch;patch=1 "
4 5
5PR = "r0" 6PR = "r1"
6 7