diff options
| author |   Richard Purdie <rpurdie@linux.intel.com> | 2010-02-01 11:02:59 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-02-01 11:02:59 +0000 |
| commit | bb217b62b7034ad9d6428c1ffb37dc0c88e29dff (patch) | |
| tree | 832afa6cf4e6c5df6806ff0f1fcd6d7fdf979d4f | |
| parent | da21a63d48f9fabd97efb0095da2bb86639bcd7a (diff) | |
| download | openembedded-core-bb217b62b7034ad9d6428c1ffb37dc0c88e29dff.tar.gz | |
libxslt: Fix double defintion problem which breaks recent autoconf/automake
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
| -rw-r--r-- | meta/packages/libxslt/libxslt/doublefix.patch | 17 | ||||
| -rw-r--r-- | meta/packages/libxslt/libxslt_1.1.22.bb | 5 |
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 @@ +This double definition breaks recent autoconf+automake. + +RP 1/2/10 + +Index: libxslt-1.1.22/libexslt/Makefile.am +=================================================================== +--- libxslt-1.1.22.orig/libexslt/Makefile.am 2010-02-01 10:55:59.337788365 +0000 ++++ libxslt-1.1.22/libexslt/Makefile.am 2010-02-01 10:56:08.239068767 +0000 +@@ -11,8 +11,6 @@ + exsltinc_HEADERS = \ + exslt.h \ + exsltconfig.h \ +- exslt.h \ +- exsltconfig.h \ + exsltexports.h + + 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" PRIORITY = "optional" DEPENDS = "libxml2 (>=2.6.27)" LICENSE = "MIT" -PR = "r2" +PR = "r3" SRC_URI = "ftp://xmlsoft.org/libxml2/libxslt-${PV}.tar.gz \ - file://pkgconfig_fix.patch;patch=1" + file://pkgconfig_fix.patch;patch=1 \ + file://doublefix.patch;patch=1" S = "${WORKDIR}/libxslt-${PV}" inherit autotools_stage pkgconfig |