summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/libxslt/libxslt-1.1.21-configure.patch18
-rw-r--r--package/libxslt/libxslt.mk8
2 files changed, 25 insertions, 1 deletions
diff --git a/package/libxslt/libxslt-1.1.21-configure.patch b/package/libxslt/libxslt-1.1.21-configure.patch
new file mode 100644
index 000000000..aae2e9e28
--- /dev/null
+++ b/package/libxslt/libxslt-1.1.21-configure.patch
@@ -0,0 +1,18 @@
+--- a/configure 2007-06-12 12:43:03.000000000 -0400
++++ b/configure 2008-02-18 08:52:36.000000000 -0500
+@@ -22090,15 +22090,11 @@ esac
+
+
+
+-XSLT_LIBDIR='-L${libdir}'
+-XSLT_INCLUDEDIR='-I${includedir}'
+ XSLT_LIBS="-lxslt $LIBXML_LIBS $M_LIBS"
+
+
+
+
+-EXSLT_LIBDIR='-L${libdir}'
+-EXSLT_INCLUDEDIR='-I${includedir}'
+ EXSLT_LIBS="-lexslt $XSLT_LIBS $LIBGCRYPT_LIBS"
+
+
diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk
index 90cc484f9..4b26ae0d1 100644
--- a/package/libxslt/libxslt.mk
+++ b/package/libxslt/libxslt.mk
@@ -13,6 +13,8 @@ $(DL_DIR)/$(LIBXSLT_SOURCE):
$(LIBXSLT_DIR)/.unpacked: $(DL_DIR)/$(LIBXSLT_SOURCE)
gzip -d -c $(DL_DIR)/$(LIBXSLT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ toolchain/patch-kernel.sh $(LIBXSLT_DIR) package/libxslt/ libxslt-$(LIBXSLT_VERSION)\*.patch*
+ $(CONFIG_UPDATE) $(LIBXSLT_DIR)
touch $@
#PKG_CONFIG_PATH="$(STAGING_DIR)/lib/pkconfig:$(STAGING_DIR)/usr/lib/pkgconfig" \
@@ -24,7 +26,10 @@ $(LIBXSLT_DIR)/.configured: $(LIBXSLT_DIR)/.unpacked
(cd $(LIBXSLT_DIR); \
$(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_ARGS) \
+ PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
CFLAGS="$(TARGET_CFLAGS) -DNO_LARGEFILE_SOURCE" \
+ EXSLT_LIBDIR=$(STAGING_DIR)/usr/lib \
+ XSLT_LIBDIR=$(STAGING_DIR)/usr/lib \
./configure \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
@@ -38,7 +43,7 @@ $(LIBXSLT_DIR)/.configured: $(LIBXSLT_DIR)/.unpacked
--sysconfdir=/etc \
--datadir=/usr/share \
--localstatedir=/var \
- --includedir=/include \
+ --includedir=/usr/include \
--mandir=/usr/man \
--infodir=/usr/info \
--enable-shared \
@@ -48,6 +53,7 @@ $(LIBXSLT_DIR)/.configured: $(LIBXSLT_DIR)/.unpacked
--without-debugging \
--without-python \
--without-threads \
+ --with-libxml-libs-prefix=$(STAGING_DIR)/usr/lib \
);
touch $@