* [Buildroot] svn commit: trunk/buildroot/package/libxslt
@ 2007-11-29 13:02 ulf at uclibc.org
0 siblings, 0 replies; 7+ messages in thread
From: ulf at uclibc.org @ 2007-11-29 13:02 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-11-29 05:02:38 -0800 (Thu, 29 Nov 2007)
New Revision: 20584
Log:
Make libxslt depend on packets, instead of selecting them
Modified:
trunk/buildroot/package/libxslt/Config.in
Changeset:
Modified: trunk/buildroot/package/libxslt/Config.in
===================================================================
--- trunk/buildroot/package/libxslt/Config.in 2007-11-29 13:02:10 UTC (rev 20583)
+++ trunk/buildroot/package/libxslt/Config.in 2007-11-29 13:02:38 UTC (rev 20584)
@@ -16,6 +16,6 @@
http://www.w3.org/TR/xslt
-comment "libxslt disabled (requires pkgconfig)"
+comment "libxslt - disabled (requires pkgconfig)"
depends !BR2_PACKAGE_PKGCONFIG
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libxslt
@ 2008-03-06 18:16 ninevoltz at uclibc.org
0 siblings, 0 replies; 7+ messages in thread
From: ninevoltz at uclibc.org @ 2008-03-06 18:16 UTC (permalink / raw)
To: buildroot
Author: ninevoltz
Date: 2008-03-06 10:16:49 -0800 (Thu, 06 Mar 2008)
New Revision: 21209
Log:
updated libxslt
Added:
trunk/buildroot/package/libxslt/libxslt-1.1.21-configure.patch
Modified:
trunk/buildroot/package/libxslt/libxslt.mk
Changeset:
Added: trunk/buildroot/package/libxslt/libxslt-1.1.21-configure.patch
===================================================================
--- trunk/buildroot/package/libxslt/libxslt-1.1.21-configure.patch (rev 0)
+++ trunk/buildroot/package/libxslt/libxslt-1.1.21-configure.patch 2008-03-06 18:16:49 UTC (rev 21209)
@@ -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"
+
+
Modified: trunk/buildroot/package/libxslt/libxslt.mk
===================================================================
--- trunk/buildroot/package/libxslt/libxslt.mk 2008-03-06 18:16:30 UTC (rev 21208)
+++ trunk/buildroot/package/libxslt/libxslt.mk 2008-03-06 18:16:49 UTC (rev 21209)
@@ -13,6 +13,8 @@
$(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 @@
(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 @@
--sysconfdir=/etc \
--datadir=/usr/share \
--localstatedir=/var \
- --includedir=/include \
+ --includedir=/usr/include \
--mandir=/usr/man \
--infodir=/usr/info \
--enable-shared \
@@ -48,6 +53,7 @@
--without-debugging \
--without-python \
--without-threads \
+ --with-libxml-libs-prefix=$(STAGING_DIR)/usr/lib \
);
touch $@
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libxslt
@ 2008-04-24 13:18 ninevoltz at uclibc.org
0 siblings, 0 replies; 7+ messages in thread
From: ninevoltz at uclibc.org @ 2008-04-24 13:18 UTC (permalink / raw)
To: buildroot
Author: ninevoltz
Date: 2008-04-24 06:18:03 -0700 (Thu, 24 Apr 2008)
New Revision: 21834
Log:
make sure xslt uses the right xml2 headers
Modified:
trunk/buildroot/package/libxslt/libxslt.mk
Changeset:
Modified: trunk/buildroot/package/libxslt/libxslt.mk
===================================================================
--- trunk/buildroot/package/libxslt/libxslt.mk 2008-04-24 13:16:39 UTC (rev 21833)
+++ trunk/buildroot/package/libxslt/libxslt.mk 2008-04-24 13:18:03 UTC (rev 21834)
@@ -54,6 +54,7 @@
--without-python \
--without-threads \
--with-libxml-libs-prefix=$(STAGING_DIR)/usr/lib \
+ CFLAGS="-I$(STAGING_DIR)/usr/include/libxml2" \
);
touch $@
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libxslt
@ 2008-06-15 17:48 jacmet at uclibc.org
0 siblings, 0 replies; 7+ messages in thread
From: jacmet at uclibc.org @ 2008-06-15 17:48 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-06-15 10:48:33 -0700 (Sun, 15 Jun 2008)
New Revision: 22351
Log:
libxslt: use select instead of depends for pkgconfig like other packages
There's not much point in using depends instead of select for pkgconfig as
it's a host tool, E.G. it doesn't add anything to the rootfs.
At the same time, strip Config.in of trailing spaces.
Modified:
trunk/buildroot/package/libxslt/Config.in
Changeset:
Modified: trunk/buildroot/package/libxslt/Config.in
===================================================================
--- trunk/buildroot/package/libxslt/Config.in 2008-06-15 11:49:42 UTC (rev 22350)
+++ trunk/buildroot/package/libxslt/Config.in 2008-06-15 17:48:33 UTC (rev 22351)
@@ -1,21 +1,18 @@
config BR2_PACKAGE_LIBXSLT
bool "libxslt"
default n
- depends BR2_PACKAGE_PKGCONFIG
+ select BR2_PACKAGE_PKGCONFIG
help
Install the xslt library which is used
to transform XML files to other XML files.
- XSLT is designed for use as part of XSL,
- which is a stylesheet language for XML.
- In addition to XSLT, XSL includes an XML vocabulary
- for specifying formatting.
+ XSLT is designed for use as part of XSL,
+ which is a stylesheet language for XML.
+ In addition to XSLT, XSL includes an XML vocabulary
+ for specifying formatting.
XSL specifies the styling of an XML document by using XSLT
to describe how the document is transformed into another
XML document that uses the formatting vocabulary.
http://www.w3.org/TR/xslt
-comment "libxslt - disabled (requires pkgconfig)"
- depends !BR2_PACKAGE_PKGCONFIG
-
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libxslt
@ 2008-08-28 11:52 laird at uclibc.org
2008-08-28 12:55 ` Peter Korsgaard
2008-08-28 12:59 ` Daniel Laird
0 siblings, 2 replies; 7+ messages in thread
From: laird at uclibc.org @ 2008-08-28 11:52 UTC (permalink / raw)
To: buildroot
Author: laird
Date: 2008-08-28 04:52:17 -0700 (Thu, 28 Aug 2008)
New Revision: 23275
Log:
libxslt: Convert to Makefile.autotools.in format
Converted to Makefile.autotools.in format
Version bumped to 1.1.24
Enabled crypto support dependant on gcrypt being chosen/not
Post process xslt-config file like freetype-config/xm2-config.
Modified:
trunk/buildroot/package/libxslt/libxslt.mk
Changeset:
Modified: trunk/buildroot/package/libxslt/libxslt.mk
===================================================================
--- trunk/buildroot/package/libxslt/libxslt.mk 2008-08-28 10:56:38 UTC (rev 23274)
+++ trunk/buildroot/package/libxslt/libxslt.mk 2008-08-28 11:52:17 UTC (rev 23275)
@@ -3,104 +3,33 @@
# libxslt
#
#############################################################
-LIBXSLT_VERSION=1.1.21
-LIBXSLT_SOURCE=libxslt-$(LIBXSLT_VERSION).tar.gz
-LIBXSLT_SITE=ftp://xmlsoft.org/libxslt
-LIBXSLT_DIR=$(BUILD_DIR)/libxslt-$(LIBXSLT_VERSION)
+LIBXSLT_VERSION = 1.1.24
+LIBXSLT_SOURCE = libxslt-$(LIBXSLT_VERSION).tar.gz
+LIBXSLT_SITE = ftp://xmlsoft.org/libxslt
+LIBXSLT_INSTALL_STAGING = YES
+LIBXSLT_INSTALL_TARGET = YES
-$(DL_DIR)/$(LIBXSLT_SOURCE):
- $(WGET) -P $(DL_DIR) $(LIBXSLT_SITE)/$(LIBXSLT_SOURCE)
+# If we have enabled libgcrypt then use it, else disable crypto support.
+ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
+LIBXSLT_DEPENDENCIES_EXTRA=libgcrypt
+else
+LIBXSLT_XTRA_CONF_OPT = --without-crypto
+endif
-$(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 $@
+LIBXSLT_CONF_OPT = --with-gnu-ld --enable-shared \
+ --enable-static $(LIBXSLT_XTRA_CONF_OPT) \
+ $(DISABLE_NLS) $(DISABLE_IPV6) \
+ --without-debugging --without-python \
+ --without-threads \
+ --with-libxml-include-prefix=$(STAGING_DIR)/usr/include/libxml2
-#PKG_CONFIG_PATH="$(STAGING_DIR)/lib/pkconfig:$(STAGING_DIR)/usr/lib/pkgconfig" \
-#PKG_CONFIG="$(STAGING_DIR)/usr/bin/pkg-config" \
-#PKG_CONFIG_SYSROOT=$(STAGING_DIR) \
-#
+LIBXSLT_DEPENDENCIES = uclibc $(LIBXSLT_DEPENDENCIES_EXTRA)
-$(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) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --exec-prefix=/usr \
- --bindir=/usr/bin \
- --sbindir=/usr/sbin \
- --libdir=/usr/lib \
- --libexecdir=/usr/lib \
- --sysconfdir=/etc \
- --datadir=/usr/share \
- --localstatedir=/var \
- --includedir=/usr/include \
- --mandir=/usr/man \
- --infodir=/usr/info \
- --enable-shared \
- $(DISABLE_NLS) \
- --enable-static \
- --enable-ipv6=no \
- --without-debugging \
- --without-python \
- --without-threads \
- --with-libxml-libs-prefix=$(STAGING_DIR)/usr/lib \
- CFLAGS="-I$(STAGING_DIR)/usr/include/libxml2" \
- );
- touch $@
+$(eval $(call AUTOTARGETS,package,libxslt))
-$(LIBXSLT_DIR)/libxslt.so: $(LIBXSLT_DIR)/.configured
- $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(LIBXSLT_DIR)
+$(LIBXSLT_HOOK_POST_INSTALL):
+ $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xslt-config
+ $(SED) "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xslt-config
+ $(SED) "s,^includedir=.*,includedir=\'$(STAGING_DIR)/usr/include\',g" $(STAGING_DIR)/usr/bin/xslt-config
touch $@
-
-$(STAGING_DIR)/usr/lib/libxslt.so: $(LIBXSLT_DIR)/libxslt.so
- $(MAKE) DESTDIR=$(STAGING_DIR) -C "$(LIBXSLT_DIR)" install
- $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libxslt.la
- -rm -rf $(STAGING_DIR)/usr/man/man1/xslt*
- -rm -rf $(STAGING_DIR)/usr/man/man3/libxslt*
- -rm -rf $(STAGING_DIR)/usr/man/man3/libexslt*
- touch $@
-$(TARGET_DIR)/usr/lib/libxslt.so: $(STAGING_DIR)/usr/lib/libxslt.so
- cp -dpf $(STAGING_DIR)/usr/lib/libxslt.so* $(TARGET_DIR)/usr/lib
- $(STRIPCMD) $(TARGET_DIR)/usr/lib/libxslt.so*
- touch $@
-
-$(TARGET_DIR)/usr/lib/libxsltx.a: $(STAGING_DIR)/usr/lib/libxslt.so
- mkdir -p $(TARGET_DIR)/usr/include/libxslt
- cp -dpf $(LIBXSLT_DIR)/libxslt/*.h $(TARGET_DIR)/usr/include/libxslt
- cp -dpf $(STAGING_DIR)/usr/lib/libxslt.a $(TARGET_DIR)/usr/lib/
- (cd $(TARGET_DIR)/usr/lib; ln -fs ../../lib/libxslt.so.$(LIBXSLT_VERSION) libxslt.so)
- touch -c $@
-
-# rm -f $(TARGET_DIR)/lib/libxslt.so.$(LIBXSLT_VERSION)
-
-libxslt-headers: $(TARGET_DIR)/usr/lib/libxslt.a
-
-libxslt: uclibc pkgconfig libgcrypt $(TARGET_DIR)/usr/lib/libxslt.so
-
-libxslt-source: $(DL_DIR)/$(LIBXSLT_SOURCE)
-
-libxslt-clean:
- rm -f $(TARGET_DIR)/lib/libxslt.so*
- -$(MAKE) -C $(LIBXSLT_DIR) clean
-
-libxslt-dirclean:
- rm -rf $(LIBXSLT_DIR)
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_LIBXSLT)),y)
-TARGETS+=libxslt
-endif
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libxslt
2008-08-28 11:52 laird at uclibc.org
@ 2008-08-28 12:55 ` Peter Korsgaard
2008-08-28 12:59 ` Daniel Laird
1 sibling, 0 replies; 7+ messages in thread
From: Peter Korsgaard @ 2008-08-28 12:55 UTC (permalink / raw)
To: buildroot
>>>>> "laird" == laird <laird@uclibc.org> writes:
laird> Author: laird
laird> Date: 2008-08-28 04:52:17 -0700 (Thu, 28 Aug 2008)
laird> New Revision: 23275
laird> Log:
laird> libxslt: Convert to Makefile.autotools.in format
laird> Converted to Makefile.autotools.in format
laird> Version bumped to 1.1.24
laird> Enabled crypto support dependant on gcrypt being chosen/not
laird> Post process xslt-config file like freetype-config/xm2-config.
I would still prefer you to these things in bite sized commits,
E.G. one patch to convert to Makefile.autotools.in, one to bump the
version, 1 to add crypto support and so on.
Makes it a lot easier to review and/or revert mistakes.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libxslt
2008-08-28 11:52 laird at uclibc.org
2008-08-28 12:55 ` Peter Korsgaard
@ 2008-08-28 12:59 ` Daniel Laird
1 sibling, 0 replies; 7+ messages in thread
From: Daniel Laird @ 2008-08-28 12:59 UTC (permalink / raw)
To: buildroot
Ok, will do this in future
Cheers
Daniel laird
--
View this message in context: http://www.nabble.com/svn-commit%3A-trunk-buildroot-package-libxslt-tp19198947p19200005.html
Sent from the BuildRoot mailing list archive at Nabble.com.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2008-08-28 12:59 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-04-24 13:18 [Buildroot] svn commit: trunk/buildroot/package/libxslt ninevoltz at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2008-08-28 11:52 laird at uclibc.org
2008-08-28 12:55 ` Peter Korsgaard
2008-08-28 12:59 ` Daniel Laird
2008-06-15 17:48 jacmet at uclibc.org
2008-03-06 18:16 ninevoltz at uclibc.org
2007-11-29 13:02 ulf at uclibc.org
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox