summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libxslt
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-12-06 14:55:33 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-18 18:03:57 +0000
commite372073f9fd8d6537454a0f406cb5919e696ffa4 (patch)
tree64b2788cdff5b41556f39a6c53448089282af5f7 /meta/recipes-support/libxslt
parent56612146f3c30261b498ea9c2facdfa7042ae0f4 (diff)
downloadpoky-e372073f9fd8d6537454a0f406cb5919e696ffa4.tar.gz
libxslt: remove inappropriate patch
This was patching -lxslt directly into the pkgconfig file, but XSLT_LIBS already contains this so the patch is redundant. (From OE-Core rev: 57b811b61dfbea551e6a4bdd98ec697729f1411b) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libxslt')
-rw-r--r--meta/recipes-support/libxslt/libxslt/pkgconfig_fix.patch24
-rw-r--r--meta/recipes-support/libxslt/libxslt_1.1.32.bb5
2 files changed, 1 insertions, 28 deletions
diff --git a/meta/recipes-support/libxslt/libxslt/pkgconfig_fix.patch b/meta/recipes-support/libxslt/libxslt/pkgconfig_fix.patch
deleted file mode 100644
index 16a801010c..0000000000
--- a/meta/recipes-support/libxslt/libxslt/pkgconfig_fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: libxslt-1.1.27/libexslt.pc.in
4===================================================================
5--- libxslt-1.1.27.orig/libexslt.pc.in
6+++ libxslt-1.1.27/libexslt.pc.in
7@@ -8,5 +8,5 @@ Name: libexslt
8 Version: @LIBEXSLT_VERSION@
9 Description: EXSLT Extension library
10 Requires: libxml-2.0
11-Libs: @EXSLT_LIBDIR@ @EXSLT_LIBS@
12+Libs: -lexslt @EXSLT_LIBDIR@ @EXSLT_LIBS@
13 Cflags: @EXSLT_INCLUDEDIR@
14Index: libxslt-1.1.27/libxslt.pc.in
15===================================================================
16--- libxslt-1.1.27.orig/libxslt.pc.in
17+++ libxslt-1.1.27/libxslt.pc.in
18@@ -8,5 +8,5 @@ Name: libxslt
19 Version: @VERSION@
20 Description: XSLT library version 2.
21 Requires: libxml-2.0
22-Libs: @XSLT_LIBDIR@ @XSLT_LIBS@ @EXTRA_LIBS@
23+Libs: -lxslt @XSLT_LIBDIR@ @XSLT_LIBS@ @EXTRA_LIBS@
24 Cflags: @XSLT_INCLUDEDIR@
diff --git a/meta/recipes-support/libxslt/libxslt_1.1.32.bb b/meta/recipes-support/libxslt/libxslt_1.1.32.bb
index b8951ab3a8..6a03f77699 100644
--- a/meta/recipes-support/libxslt/libxslt_1.1.32.bb
+++ b/meta/recipes-support/libxslt/libxslt_1.1.32.bb
@@ -8,10 +8,7 @@ LIC_FILES_CHKSUM = "file://Copyright;md5=0cd9a07afbeb24026c9b03aecfeba458"
8SECTION = "libs" 8SECTION = "libs"
9DEPENDS = "libxml2" 9DEPENDS = "libxml2"
10 10
11SRC_URI = "http://xmlsoft.org/sources/libxslt-${PV}.tar.gz \ 11SRC_URI = "http://xmlsoft.org/sources/libxslt-${PV}.tar.gz"
12 file://pkgconfig_fix.patch \
13 "
14
15SRC_URI[md5sum] = "1fc72f98e98bf4443f1651165f3aa146" 12SRC_URI[md5sum] = "1fc72f98e98bf4443f1651165f3aa146"
16SRC_URI[sha256sum] = "526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460" 13SRC_URI[sha256sum] = "526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460"
17 14