From 57b811b61dfbea551e6a4bdd98ec697729f1411b Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 6 Dec 2017 14:55:33 +0000 Subject: libxslt: remove inappropriate patch This was patching -lxslt directly into the pkgconfig file, but XSLT_LIBS already contains this so the patch is redundant. Signed-off-by: Ross Burton --- .../libxslt/libxslt/pkgconfig_fix.patch | 24 ---------------------- meta/recipes-support/libxslt/libxslt_1.1.32.bb | 5 +---- 2 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 meta/recipes-support/libxslt/libxslt/pkgconfig_fix.patch 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 @@ -Upstream-Status: Inappropriate [configuration] - -Index: libxslt-1.1.27/libexslt.pc.in -=================================================================== ---- libxslt-1.1.27.orig/libexslt.pc.in -+++ libxslt-1.1.27/libexslt.pc.in -@@ -8,5 +8,5 @@ Name: libexslt - Version: @LIBEXSLT_VERSION@ - Description: EXSLT Extension library - Requires: libxml-2.0 --Libs: @EXSLT_LIBDIR@ @EXSLT_LIBS@ -+Libs: -lexslt @EXSLT_LIBDIR@ @EXSLT_LIBS@ - Cflags: @EXSLT_INCLUDEDIR@ -Index: libxslt-1.1.27/libxslt.pc.in -=================================================================== ---- libxslt-1.1.27.orig/libxslt.pc.in -+++ libxslt-1.1.27/libxslt.pc.in -@@ -8,5 +8,5 @@ Name: libxslt - Version: @VERSION@ - Description: XSLT library version 2. - Requires: libxml-2.0 --Libs: @XSLT_LIBDIR@ @XSLT_LIBS@ @EXTRA_LIBS@ -+Libs: -lxslt @XSLT_LIBDIR@ @XSLT_LIBS@ @EXTRA_LIBS@ - 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" SECTION = "libs" DEPENDS = "libxml2" -SRC_URI = "http://xmlsoft.org/sources/libxslt-${PV}.tar.gz \ - file://pkgconfig_fix.patch \ - " - +SRC_URI = "http://xmlsoft.org/sources/libxslt-${PV}.tar.gz" SRC_URI[md5sum] = "1fc72f98e98bf4443f1651165f3aa146" SRC_URI[sha256sum] = "526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460" -- cgit 1.2.3-korg