summaryrefslogtreecommitdiffstats
path: root/meta/packages/libxslt
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-02-01 11:02:59 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-02-01 11:02:59 +0000
commitbb217b62b7034ad9d6428c1ffb37dc0c88e29dff (patch)
tree832afa6cf4e6c5df6806ff0f1fcd6d7fdf979d4f /meta/packages/libxslt
parentda21a63d48f9fabd97efb0095da2bb86639bcd7a (diff)
downloadpoky-bb217b62b7034ad9d6428c1ffb37dc0c88e29dff.tar.gz
libxslt: Fix double defintion problem which breaks recent autoconf/automake
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/libxslt')
-rw-r--r--meta/packages/libxslt/libxslt/doublefix.patch17
-rw-r--r--meta/packages/libxslt/libxslt_1.1.22.bb5
2 files changed, 20 insertions, 2 deletions
diff --git a/meta/packages/libxslt/libxslt/doublefix.patch b/meta/packages/libxslt/libxslt/doublefix.patch
new file mode 100644
index 0000000000..e70393dcb7
--- /dev/null
+++ b/meta/packages/libxslt/libxslt/doublefix.patch
@@ -0,0 +1,17 @@
1This double definition breaks recent autoconf+automake.
2
3RP 1/2/10
4
5Index: libxslt-1.1.22/libexslt/Makefile.am
6===================================================================
7--- libxslt-1.1.22.orig/libexslt/Makefile.am 2010-02-01 10:55:59.337788365 +0000
8+++ libxslt-1.1.22/libexslt/Makefile.am 2010-02-01 10:56:08.239068767 +0000
9@@ -11,8 +11,6 @@
10 exsltinc_HEADERS = \
11 exslt.h \
12 exsltconfig.h \
13- exslt.h \
14- exsltconfig.h \
15 exsltexports.h
16
17 libexslt_la_SOURCES = \
diff --git a/meta/packages/libxslt/libxslt_1.1.22.bb b/meta/packages/libxslt/libxslt_1.1.22.bb
index f32a6aa52f..49a1b6b018 100644
--- a/meta/packages/libxslt/libxslt_1.1.22.bb
+++ b/meta/packages/libxslt/libxslt_1.1.22.bb
@@ -3,10 +3,11 @@ SECTION = "libs"
3PRIORITY = "optional" 3PRIORITY = "optional"
4DEPENDS = "libxml2 (>=2.6.27)" 4DEPENDS = "libxml2 (>=2.6.27)"
5LICENSE = "MIT" 5LICENSE = "MIT"
6PR = "r2" 6PR = "r3"
7 7
8SRC_URI = "ftp://xmlsoft.org/libxml2/libxslt-${PV}.tar.gz \ 8SRC_URI = "ftp://xmlsoft.org/libxml2/libxslt-${PV}.tar.gz \
9 file://pkgconfig_fix.patch;patch=1" 9 file://pkgconfig_fix.patch;patch=1 \
10 file://doublefix.patch;patch=1"
10S = "${WORKDIR}/libxslt-${PV}" 11S = "${WORKDIR}/libxslt-${PV}"
11 12
12inherit autotools_stage pkgconfig 13inherit autotools_stage pkgconfig