[oe-commits] org.oe.dev libxslt: Remove Koen's gross hack and replace with a proper patch

[rpurdie commit]

libxslt: Remove Koen's gross hack and replace with a proper patch

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: f2f68aafba6de2e0ef114fd7250963b2f1353def
ViewMTN: http://monotone.openembedded.org/revision/info/f2f68aafba6de2e0ef114fd7250963b2f1353def
Files:
1
packages/libxslt/files/pkgconfig_fix.patch
packages/libxslt/libxslt_1.1.22.bb
Diffs:

#
# mt diff -r8438ae3b4dcd083936783628f006b22c3e731b02 -rf2f68aafba6de2e0ef114fd7250963b2f1353def
#
#
#
# add_file "packages/libxslt/files/pkgconfig_fix.patch"
#  content [28fc56d274cb50de2e17a51fc66b07da8ca5c8ff]
# 
# patch "packages/libxslt/libxslt_1.1.22.bb"
#  from [79128c5d67c70cbfa31d1f46637bcb63e408194e]
#    to [b5264faaacfc79c2c5e125d6356dd225533deeb9]
#
============================================================
--- packages/libxslt/files/pkgconfig_fix.patch	28fc56d274cb50de2e17a51fc66b07da8ca5c8ff
+++ packages/libxslt/files/pkgconfig_fix.patch	28fc56d274cb50de2e17a51fc66b07da8ca5c8ff
@@ -0,0 +1,22 @@
+Index: libxslt-1.1.22/libexslt.pc.in
+===================================================================
+--- libxslt-1.1.22.orig/libexslt.pc.in	2008-03-19 16:52:20.000000000 +0000
++++ libxslt-1.1.22/libexslt.pc.in	2008-03-19 16:55:49.000000000 +0000
+@@ -8,5 +8,5 @@
+ Version: @LIBEXSLT_VERSION@
+ Description: EXSLT Extension library
+ Requires: libxml-2.0
+-Libs: @EXSLT_LIBDIR@ @EXSLT_LIBS@
++Libs: -lxslt @EXSLT_LIBDIR@ @M_LIBS@
+ Cflags: @EXSLT_INCLUDEDIR@
+Index: libxslt-1.1.22/libxslt.pc.in
+===================================================================
+--- libxslt-1.1.22.orig/libxslt.pc.in	2008-03-19 16:52:20.000000000 +0000
++++ libxslt-1.1.22/libxslt.pc.in	2008-03-19 16:55:38.000000000 +0000
+@@ -8,5 +8,5 @@
+ Version: @VERSION@
+ Description: XSLT library version 2.
+ Requires: libxml-2.0
+-Libs: @XSLT_LIBDIR@ @XSLT_LIBS@
++Libs: -lxslt @XSLT_LIBDIR@ @M_LIBS@
+ Cflags: @XSLT_INCLUDEDIR@
============================================================
--- packages/libxslt/libxslt_1.1.22.bb	79128c5d67c70cbfa31d1f46637bcb63e408194e
+++ packages/libxslt/libxslt_1.1.22.bb	b5264faaacfc79c2c5e125d6356dd225533deeb9
@@ -3,21 +3,16 @@ LICENSE = "MIT"
 PRIORITY = "optional"
 DEPENDS = "libxml2 (>=2.6.27)"
 LICENSE = "MIT"
+PR = "r1"
 
-SRC_URI = "ftp://xmlsoft.org/libxml2/libxslt-${PV}.tar.gz"
+SRC_URI = "ftp://xmlsoft.org/libxml2/libxslt-${PV}.tar.gz \
+           file://pkgconfig_fix.patch;patch=1"
 S = "${WORKDIR}/libxslt-${PV}"
 
 inherit autotools pkgconfig
 
 EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto"
 
-# Something is wrong inside configure.ac, so we need to resort to sed in this stage :(
-# Koen - 20080305
-do_compile_append() {
-	sed -i -e s:-L${STAGING_LIBDIR}::g  libexslt.pc
-	sed -i -e s:-L${STAGING_LIBDIR}::g  libxslt.pc
-} 
-
 do_stage () {
 	autotools_stage_all
 }