瀏覽代碼

libxslt: Fix double defintion problem which breaks recent autoconf/automake

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Richard Purdie 15 年之前
父節點
當前提交
bb217b62b7
共有 2 個文件被更改,包括 20 次插入2 次删除
  1. 17 0
      meta/packages/libxslt/libxslt/doublefix.patch
  2. 3 2
      meta/packages/libxslt/libxslt_1.1.22.bb

+ 17 - 0
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 =                   \

+ 3 - 2
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