diff options
Diffstat (limited to 'meta/recipes-support/libxslt')
-rw-r--r-- | meta/recipes-support/libxslt/libxslt/pkgconfig.patch | 118 | ||||
-rw-r--r-- | meta/recipes-support/libxslt/libxslt/pkgconfig_fix.patch | 24 | ||||
-rw-r--r-- | meta/recipes-support/libxslt/libxslt_1.1.28.bb | 46 |
3 files changed, 188 insertions, 0 deletions
diff --git a/meta/recipes-support/libxslt/libxslt/pkgconfig.patch b/meta/recipes-support/libxslt/libxslt/pkgconfig.patch new file mode 100644 index 0000000000..89d14c944d --- /dev/null +++ b/meta/recipes-support/libxslt/libxslt/pkgconfig.patch | |||
@@ -0,0 +1,118 @@ | |||
1 | Use pkg-config to find gcrypt and libxml2. | ||
2 | |||
3 | Upstream-Status: Pending [libxml2 is upstreamable] | ||
4 | |||
5 | RP 2014/5/22 | ||
6 | |||
7 | Index: libxslt-1.1.28/configure.in | ||
8 | =================================================================== | ||
9 | --- libxslt-1.1.28.orig/configure.in 2014-05-13 16:46:02.278474967 +0000 | ||
10 | +++ libxslt-1.1.28/configure.in 2014-05-13 16:53:56.510472561 +0000 | ||
11 | @@ -376,6 +376,8 @@ | ||
12 | AC_SUBST(PYTHON_SUBDIR) | ||
13 | AC_SUBST(PYTHON_LIBS) | ||
14 | |||
15 | +PKG_PROG_PKG_CONFIG | ||
16 | + | ||
17 | AC_ARG_WITH(crypto, [ --with-crypto Add crypto support to exslt (on)]) | ||
18 | WITH_CRYPTO=0 | ||
19 | if test "$with_crypto" = "no" ; then | ||
20 | @@ -391,26 +393,13 @@ | ||
21 | WITH_CRYPTO=1 | ||
22 | ;; | ||
23 | *) | ||
24 | - AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no) | ||
25 | - if test "$LIBGCRYPT_CONFIG" != "no" ; then | ||
26 | - LIBGCRYPT_VERSION=`$LIBGCRYPT_CONFIG --version` | ||
27 | - if test VERSION_TO_NUMBER(echo $LIBGCRYPT_VERSION) -lt VERSION_TO_NUMBER(echo "1.1.42") | ||
28 | - then | ||
29 | - LIBGCRYPT_CFLAGS="" | ||
30 | - LIBGCRYPT_LIBS="" | ||
31 | - echo 'gcrypt library version < 1.1.42 - Crypto extensions will not be available.' | ||
32 | - else | ||
33 | - LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG $libgcrypt_config_args --cflags` | ||
34 | - LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG $libgcrypt_config_args --libs` | ||
35 | - AC_DEFINE(HAVE_GCRYPT, 1, [Define if gcrypt library is available.]) | ||
36 | - echo 'Crypto extensions will be available.' | ||
37 | + PKG_CHECK_MODULES(LIBGCRYPT, [libgcrypt >= 1.1.42], [ | ||
38 | + AC_DEFINE(HAVE_GCRYPT, 1, [Define if gcrypt library is available.]) | ||
39 | + echo 'Crypto extensions will be available.' | ||
40 | WITH_CRYPTO=1 | ||
41 | - fi | ||
42 | - else | ||
43 | - LIBGCRYPT_CFLAGS="" | ||
44 | - LIBGCRYPT_LIBS="" | ||
45 | - echo 'Crypto extensions will not be available. Install libgcrypt and reconfigure to make available.' | ||
46 | - fi | ||
47 | + ], [ | ||
48 | + echo 'Crypto extensions will not be available. Install libgcrypt >= 1.1.42 and reconfigure to make available.' | ||
49 | + ]) | ||
50 | esac | ||
51 | fi | ||
52 | AC_SUBST(WITH_CRYPTO) | ||
53 | @@ -471,24 +460,8 @@ | ||
54 | dnl some tweaking - David Härdeman 30/10/2001 | ||
55 | dnl | ||
56 | |||
57 | -LIBXML_CONFIG_PREFIX="" | ||
58 | LIBXML_SRC="" | ||
59 | |||
60 | -AC_ARG_WITH(libxml-prefix, | ||
61 | - [ --with-libxml-prefix=[PFX] Specify location of libxml config], | ||
62 | - LIBXML_CONFIG_PREFIX=$withval | ||
63 | -) | ||
64 | - | ||
65 | -AC_ARG_WITH(libxml-include-prefix, | ||
66 | - [ --with-libxml-include-prefix=[PFX] Specify location of libxml headers], | ||
67 | - LIBXML_CFLAGS="-I$withval" | ||
68 | -) | ||
69 | - | ||
70 | -AC_ARG_WITH(libxml-libs-prefix, | ||
71 | - [ --with-libxml-libs-prefix=[PFX] Specify location of libxml libs], | ||
72 | - LIBXML_LIBS="-L$withval" | ||
73 | -) | ||
74 | - | ||
75 | AC_ARG_WITH(libxml-src, | ||
76 | [ --with-libxml-src=[DIR] For libxml thats not installed yet (sets all three above)], | ||
77 | LIBXML_SRC="$withval" | ||
78 | @@ -551,28 +524,9 @@ | ||
79 | fi | ||
80 | fi | ||
81 | |||
82 | -dnl | ||
83 | -dnl make sure xml2-config is executable, | ||
84 | -dnl test version and init our variables | ||
85 | -dnl | ||
86 | - | ||
87 | -if ${XML_CONFIG} --libs print > /dev/null 2>&1 | ||
88 | -then | ||
89 | - XMLVERS=`$XML_CONFIG --version` | ||
90 | - if test VERSION_TO_NUMBER(echo $XMLVERS) -ge VERSION_TO_NUMBER(echo $LIBXML_REQUIRED_VERSION) | ||
91 | - then | ||
92 | - AC_MSG_RESULT($XMLVERS found) | ||
93 | - else | ||
94 | - AC_MSG_ERROR(Version $XMLVERS found. You need at least libxml2 $LIBXML_REQUIRED_VERSION for this version of libxslt) | ||
95 | - fi | ||
96 | - LIBXML_LIBS="$LIBXML_LIBS `$XML_CONFIG --libs`" | ||
97 | - if test "x$LIBXML_SRC" = "x"; then | ||
98 | - LIBXML_CFLAGS="$LIBXML_CFLAGS `$XML_CONFIG --cflags`" | ||
99 | - fi | ||
100 | -else | ||
101 | - AC_MSG_ERROR([Could not find libxml2 anywhere, check ftp://xmlsoft.org/.]) | ||
102 | -fi | ||
103 | - | ||
104 | +PKG_CHECK_MODULES(LIBXML, [libxml-2.0 >= $LIBXML_REQUIRED_VERSION],, | ||
105 | + [AC_MSG_ERROR([Could not find libxml-2.0 >= $LIBXML_REQUIRED_VERSION anywhere, check ftp://xmlsoft.org/.])] | ||
106 | +) | ||
107 | |||
108 | AC_SUBST(CFLAGS) | ||
109 | AC_SUBST(CPPFLAGS) | ||
110 | @@ -597,7 +551,7 @@ | ||
111 | |||
112 | if test "$with_plugins" = "yes" ; then | ||
113 | AC_MSG_CHECKING([libxml2 module support]) | ||
114 | - WITH_MODULES="`$XML_CONFIG --modules`" | ||
115 | + WITH_MODULES="`$PKG_CONFIG --variable=modules libxml-2.0`" | ||
116 | if test "${WITH_MODULES}" = "1"; then | ||
117 | AC_MSG_RESULT(yes) | ||
118 | else | ||
diff --git a/meta/recipes-support/libxslt/libxslt/pkgconfig_fix.patch b/meta/recipes-support/libxslt/libxslt/pkgconfig_fix.patch new file mode 100644 index 0000000000..16a801010c --- /dev/null +++ b/meta/recipes-support/libxslt/libxslt/pkgconfig_fix.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | Index: 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@ | ||
14 | Index: 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.28.bb b/meta/recipes-support/libxslt/libxslt_1.1.28.bb new file mode 100644 index 0000000000..ded883e457 --- /dev/null +++ b/meta/recipes-support/libxslt/libxslt_1.1.28.bb | |||
@@ -0,0 +1,46 @@ | |||
1 | SUMMARY = "GNOME XSLT library" | ||
2 | HOMEPAGE = "http://xmlsoft.org/XSLT/" | ||
3 | BUGTRACKER = "https://bugzilla.gnome.org/" | ||
4 | |||
5 | LICENSE = "MIT" | ||
6 | LIC_FILES_CHKSUM = "file://Copyright;md5=0cd9a07afbeb24026c9b03aecfeba458" | ||
7 | |||
8 | SECTION = "libs" | ||
9 | DEPENDS = "libxml2" | ||
10 | |||
11 | SRC_URI = "ftp://xmlsoft.org/libxslt//libxslt-${PV}.tar.gz \ | ||
12 | file://pkgconfig_fix.patch \ | ||
13 | file://pkgconfig.patch" | ||
14 | |||
15 | SRC_URI[md5sum] = "9667bf6f9310b957254fdcf6596600b7" | ||
16 | SRC_URI[sha256sum] = "5fc7151a57b89c03d7b825df5a0fae0a8d5f05674c0e7cf2937ecec4d54a028c" | ||
17 | S = "${WORKDIR}/libxslt-${PV}" | ||
18 | |||
19 | BINCONFIG = "${bindir}/xslt-config" | ||
20 | |||
21 | inherit autotools pkgconfig binconfig-disabled lib_package | ||
22 | |||
23 | # We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header | ||
24 | do_configure_prepend () { | ||
25 | sed -i -e 's/ansidecl.h//' ${S}/configure.in | ||
26 | |||
27 | # The timestamps in the 1.1.28 tarball are messed up causing this file to | ||
28 | # appear out of date. Touch it so that we don't try to regenerate it. | ||
29 | touch ${S}/doc/xsltproc.1 | ||
30 | } | ||
31 | |||
32 | EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto" | ||
33 | # older versions of this recipe had ${PN}-utils | ||
34 | RPROVIDES_${PN}-bin += "${PN}-utils" | ||
35 | RCONFLICTS_${PN}-bin += "${PN}-utils" | ||
36 | RREPLACES_${PN}-bin += "${PN}-utils" | ||
37 | |||
38 | |||
39 | do_install_append_class-native () { | ||
40 | create_wrapper ${D}/${bindir}/xsltproc XML_CATALOG_FILES=${sysconfdir}/xml/catalog.xml | ||
41 | } | ||
42 | |||
43 | FILES_${PN} += "${libdir}/libxslt-plugins" | ||
44 | FILES_${PN}-dev += "${libdir}/xsltConf.sh" | ||
45 | |||
46 | BBCLASSEXTEND = "native" | ||