* [Buildroot] svn commit: trunk/buildroot/package/libxml2
@ 2007-08-07 17:28 ulf at uclibc.org
0 siblings, 0 replies; 18+ messages in thread
From: ulf at uclibc.org @ 2007-08-07 17:28 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-08-07 10:27:59 -0700 (Tue, 07 Aug 2007)
New Revision: 19416
Log:
Cleanup libxml2
Modified:
trunk/buildroot/package/libxml2/Config.in
trunk/buildroot/package/libxml2/libxml2.mk
Changeset:
Modified: trunk/buildroot/package/libxml2/Config.in
===================================================================
--- trunk/buildroot/package/libxml2/Config.in 2007-08-06 19:41:40 UTC (rev 19415)
+++ trunk/buildroot/package/libxml2/Config.in 2007-08-07 17:27:59 UTC (rev 19416)
@@ -1,19 +1,15 @@
config BR2_PACKAGE_LIBXML2
bool "libxml2"
default n
- depends on BR2_USE_WCHAR
help
XML C Parser
- Requires WCHAR
-
ftp://xmlsoft.org/libxml2
config BR2_PACKAGE_LIBXML2_TARGET_HEADERS
bool "libxml2 target headers"
default n
+ depends on BR2_PACKAGE_LIBXML2
help
XML C Parser
- Requires WCHAR
-
ftp://xmlsoft.org/libxml2
Modified: trunk/buildroot/package/libxml2/libxml2.mk
===================================================================
--- trunk/buildroot/package/libxml2/libxml2.mk 2007-08-06 19:41:40 UTC (rev 19415)
+++ trunk/buildroot/package/libxml2/libxml2.mk 2007-08-07 17:27:59 UTC (rev 19416)
@@ -26,8 +26,23 @@
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
--prefix=/usr \
+ --exec-prefix=/usr \
+ --bindir=/usr/bin \
+ --sbindir=/usr/sbin \
+ --libexecdir=/usr/lib \
--sysconfdir=/etc \
+ --datadir=/usr/share \
+ --localstatedir=/var \
+ --mandir=/usr/man \
+ --infodir=/usr/info \
+ --includedir=/usr/include \
+ --with-gnu-ld \
--enable-shared \
+ --enable-static \
+ --enable-ipv6=no \
+ --without-debugging \
+ --without-python \
+ --without-threads \
$(DISABLE_NLS) \
);
touch $(LIBXML2_DIR)/.configured
@@ -38,6 +53,10 @@
$(STAGING_DIR)/usr/lib/libxml2.so: $(LIBXML2_DIR)/libxml2.la
$(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBXML2_DIR) install
+ rm -f $(STAGING_DIR)/usr/lib/libxml2.la
+ $(SED) 's:prefix=/usr:prefix=$(STAGING_DIR)/usr:' \
+ -e 's:includedir=/usr/include:includedir=$(STAGING_DIR)/usr/include:' \
+ $(STAGING_DIR)/usr/bin/xml2-config
$(TARGET_DIR)/usr/lib/libxml2.so: $(STAGING_DIR)/usr/lib/libxml2.so
cp -dpf $(STAGING_DIR)/usr/lib/libxml2.so* $(TARGET_DIR)/usr/lib/
^ permalink raw reply [flat|nested] 18+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libxml2
@ 2009-01-27 15:02 jacmet at uclibc.org
0 siblings, 0 replies; 18+ messages in thread
From: jacmet at uclibc.org @ 2009-01-27 15:02 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-01-27 15:02:34 +0000 (Tue, 27 Jan 2009)
New Revision: 25079
Log:
libxml2: stop continous rerun of post-extract target
Touch stamp file (seems to have been missed by r23656).
Modified:
trunk/buildroot/package/libxml2/libxml2.mk
Changeset:
Modified: trunk/buildroot/package/libxml2/libxml2.mk
===================================================================
--- trunk/buildroot/package/libxml2/libxml2.mk 2009-01-27 15:02:29 UTC (rev 25078)
+++ trunk/buildroot/package/libxml2/libxml2.mk 2009-01-27 15:02:34 UTC (rev 25079)
@@ -25,6 +25,7 @@
$(LIBXML2_HOOK_POST_EXTRACT):
rm -f $(LIBXML2_DIR)/win32/Makefile.msvc.rej
rm -f $(LIBXML2_DIR)/macos/src/XMLTestPrefix.h.rej
+ touch $@
$(LIBXML2_HOOK_POST_INSTALL):
$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xml2-config
^ permalink raw reply [flat|nested] 18+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libxml2
@ 2008-10-10 14:41 laird at uclibc.org
0 siblings, 0 replies; 18+ messages in thread
From: laird at uclibc.org @ 2008-10-10 14:41 UTC (permalink / raw)
To: buildroot
Author: laird
Date: 2008-10-10 07:41:18 -0700 (Fri, 10 Oct 2008)
New Revision: 23656
Log:
package/libxml2/libxml2.mk: Bounce version to 2.6.32
Bounce the version to 2.6.32.
And deal with the left over .rej files.
Daniel Laird
Modified:
trunk/buildroot/package/libxml2/libxml2.mk
Changeset:
Modified: trunk/buildroot/package/libxml2/libxml2.mk
===================================================================
--- trunk/buildroot/package/libxml2/libxml2.mk 2008-10-10 13:50:38 UTC (rev 23655)
+++ trunk/buildroot/package/libxml2/libxml2.mk 2008-10-10 14:41:18 UTC (rev 23656)
@@ -3,7 +3,7 @@
# libxml2
#
#############################################################
-LIBXML2_VERSION = 2.6.31
+LIBXML2_VERSION = 2.6.32
LIBXML2_SOURCE = libxml2-sources-$(LIBXML2_VERSION).tar.gz
LIBXML2_SITE = ftp://xmlsoft.org/libxml2
LIBXML2_INSTALL_STAGING = YES
@@ -23,6 +23,10 @@
$(eval $(call AUTOTARGETS,package,libxml2))
+$(LIBXML2_HOOK_POST_EXTRACT):
+ rm -f $(LIBXML2_DIR)/win32/Makefile.msvc.rej
+ rm -f $(LIBXML2_DIR)/macos/src/XMLTestPrefix.h.rej
+
$(LIBXML2_HOOK_POST_INSTALL):
$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xml2-config
$(SED) "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xml2-config
^ permalink raw reply [flat|nested] 18+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libxml2
@ 2008-08-28 10:56 laird at uclibc.org
2008-08-28 11:37 ` Bernhard Reutner-Fischer
0 siblings, 1 reply; 18+ messages in thread
From: laird at uclibc.org @ 2008-08-28 10:56 UTC (permalink / raw)
To: buildroot
Author: laird
Date: 2008-08-28 03:56:38 -0700 (Thu, 28 Aug 2008)
New Revision: 23274
Log:
libxml2: Post process xml2-config file to actually work and bump version
Version bumped to 2.6.31
(2.6.32 has .rej files so patch target fails - upstream need to be informed).
The xml2-config file in staging dir needs to have prefix / exec-prefix setup
to understand the staging directory location.
This then means that packages that call xml2-config to get include paths/cflags
and libs etc work properly.
This is very similar to what freetype does to freetype-config.
Modified:
trunk/buildroot/package/libxml2/libxml2.mk
Changeset:
Modified: trunk/buildroot/package/libxml2/libxml2.mk
===================================================================
--- trunk/buildroot/package/libxml2/libxml2.mk 2008-08-28 07:33:17 UTC (rev 23273)
+++ trunk/buildroot/package/libxml2/libxml2.mk 2008-08-28 10:56:38 UTC (rev 23274)
@@ -3,11 +3,9 @@
# libxml2
#
#############################################################
-
-LIBXML2_VERSION = 2.6.29
+LIBXML2_VERSION = 2.6.31
LIBXML2_SOURCE = libxml2-sources-$(LIBXML2_VERSION).tar.gz
LIBXML2_SITE = ftp://xmlsoft.org/libxml2
-LIBXML2_AUTORECONF = NO
LIBXML2_INSTALL_STAGING = YES
LIBXML2_INSTALL_TARGET = YES
LIBXML2_INSTALL_TARGET_OPT:=DESTDIR=$(TARGET_DIR) install-strip
@@ -26,6 +24,8 @@
$(eval $(call AUTOTARGETS,package,libxml2))
$(LIBXML2_HOOK_POST_INSTALL):
+ $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xml2-config
+ $(SED) "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xml2-config
rm -rf $(TARGET_DIR)/usr/share/aclocal \
$(TARGET_DIR)/usr/share/doc/libxml2-$(LIBXML2_VERSION) \
$(TARGET_DIR)/usr/share/gtk-doc
^ permalink raw reply [flat|nested] 18+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libxml2
2008-08-28 10:56 laird at uclibc.org
@ 2008-08-28 11:37 ` Bernhard Reutner-Fischer
0 siblings, 0 replies; 18+ messages in thread
From: Bernhard Reutner-Fischer @ 2008-08-28 11:37 UTC (permalink / raw)
To: buildroot
On Thu, Aug 28, 2008 at 03:56:39AM -0700, laird at uclibc.org wrote:
>Author: laird
>Date: 2008-08-28 03:56:38 -0700 (Thu, 28 Aug 2008)
>New Revision: 23274
>
>Log:
>libxml2: Post process xml2-config file to actually work and bump version
>
>Version bumped to 2.6.31
>(2.6.32 has .rej files so patch target fails - upstream need to be informed).
Yes, please inform upstream. But such packaging issues are no excuse to
exclude that particular release.
I'm pretty sure that there is at least one other package that is also
shipped with .rej (which were apparently resolved properly) where we rm
-f $(FOO_DIR)/the/inappropriately_packaged.rej
Please consider doing the same for libxml2.
TIA,
^ permalink raw reply [flat|nested] 18+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libxml2
@ 2008-08-24 7:48 jacmet at uclibc.org
0 siblings, 0 replies; 18+ messages in thread
From: jacmet at uclibc.org @ 2008-08-24 7:48 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-08-24 00:48:15 -0700 (Sun, 24 Aug 2008)
New Revision: 23192
Log:
libxml2: enable ipv6 support if enabled in buildroot
Modified:
trunk/buildroot/package/libxml2/libxml2.mk
Changeset:
Modified: trunk/buildroot/package/libxml2/libxml2.mk
===================================================================
--- trunk/buildroot/package/libxml2/libxml2.mk 2008-08-24 00:02:18 UTC (rev 23191)
+++ trunk/buildroot/package/libxml2/libxml2.mk 2008-08-24 07:48:15 UTC (rev 23192)
@@ -17,7 +17,7 @@
endif
LIBXML2_CONF_OPT = --with-gnu-ld --enable-shared \
- --enable-static --enable-ipv6=no \
+ --enable-static $(DISABLE_IPV6) \
--without-debugging --without-python \
--without-threads $(DISABLE_NLS)
^ permalink raw reply [flat|nested] 18+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libxml2
@ 2008-08-23 13:08 jacmet at uclibc.org
0 siblings, 0 replies; 18+ messages in thread
From: jacmet at uclibc.org @ 2008-08-23 13:08 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-08-23 06:08:37 -0700 (Sat, 23 Aug 2008)
New Revision: 23186
Log:
libxml2: use install-strip instead of install-exec for target install
Use install-strip so binaries gets stripped and man pages / header files
gets installed.
Modified:
trunk/buildroot/package/libxml2/libxml2.mk
Changeset:
Modified: trunk/buildroot/package/libxml2/libxml2.mk
===================================================================
--- trunk/buildroot/package/libxml2/libxml2.mk 2008-08-23 13:08:34 UTC (rev 23185)
+++ trunk/buildroot/package/libxml2/libxml2.mk 2008-08-23 13:08:37 UTC (rev 23186)
@@ -10,6 +10,7 @@
LIBXML2_AUTORECONF = NO
LIBXML2_INSTALL_STAGING = YES
LIBXML2_INSTALL_TARGET = YES
+LIBXML2_INSTALL_TARGET_OPT:=DESTDIR=$(TARGET_DIR) install-strip
ifneq ($(BR2_LARGEFILE),y)
LIBXML2_CONF_ENV = CC="$(TARGET_CC) $(TARGET_CFLAGS) -DNO_LARGEFILE_SOURCE"
@@ -25,5 +26,7 @@
$(eval $(call AUTOTARGETS,package,libxml2))
$(LIBXML2_HOOK_POST_INSTALL):
- $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libxml2*so*
+ rm -rf $(TARGET_DIR)/usr/share/aclocal \
+ $(TARGET_DIR)/usr/share/doc/libxml2-$(LIBXML2_VERSION) \
+ $(TARGET_DIR)/usr/share/gtk-doc
touch $@
^ permalink raw reply [flat|nested] 18+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libxml2
@ 2008-08-23 13:08 jacmet at uclibc.org
0 siblings, 0 replies; 18+ messages in thread
From: jacmet at uclibc.org @ 2008-08-23 13:08 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-08-23 06:08:34 -0700 (Sat, 23 Aug 2008)
New Revision: 23185
Log:
libxml2: cleanup configure args
Modified:
trunk/buildroot/package/libxml2/libxml2.mk
Changeset:
Modified: trunk/buildroot/package/libxml2/libxml2.mk
===================================================================
--- trunk/buildroot/package/libxml2/libxml2.mk 2008-08-23 13:08:31 UTC (rev 23184)
+++ trunk/buildroot/package/libxml2/libxml2.mk 2008-08-23 13:08:34 UTC (rev 23185)
@@ -15,14 +15,7 @@
LIBXML2_CONF_ENV = CC="$(TARGET_CC) $(TARGET_CFLAGS) -DNO_LARGEFILE_SOURCE"
endif
-LIBXML2_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) --prefix=/usr \
- --exec-prefix=/usr --bindir=/usr/bin \
- --sbindir=/usr/sbin --libexecdir=/usr/lib \
- --sysconfdir=/etc --datadir=/usr/share \
- --localstatedir=/var --mandir=/usr/man \
- --infodir=/usr/info --includedir=/usr/include \
- --with-gnu-ld --enable-shared \
+LIBXML2_CONF_OPT = --with-gnu-ld --enable-shared \
--enable-static --enable-ipv6=no \
--without-debugging --without-python \
--without-threads $(DISABLE_NLS)
^ permalink raw reply [flat|nested] 18+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libxml2
@ 2008-08-23 13:08 jacmet at uclibc.org
0 siblings, 0 replies; 18+ messages in thread
From: jacmet at uclibc.org @ 2008-08-23 13:08 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-08-23 06:08:31 -0700 (Sat, 23 Aug 2008)
New Revision: 23184
Log:
libxml2: point to homepage instead of ftp site in help
Modified:
trunk/buildroot/package/libxml2/Config.in
Changeset:
Modified: trunk/buildroot/package/libxml2/Config.in
===================================================================
--- trunk/buildroot/package/libxml2/Config.in 2008-08-23 13:08:28 UTC (rev 23183)
+++ trunk/buildroot/package/libxml2/Config.in 2008-08-23 13:08:31 UTC (rev 23184)
@@ -2,4 +2,5 @@
bool "libxml2"
help
XML C Parser
- ftp://xmlsoft.org/libxml2
+
+ http://xmlsoft.org/
^ permalink raw reply [flat|nested] 18+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libxml2
@ 2008-08-23 13:08 jacmet at uclibc.org
0 siblings, 0 replies; 18+ messages in thread
From: jacmet at uclibc.org @ 2008-08-23 13:08 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-08-23 06:08:28 -0700 (Sat, 23 Aug 2008)
New Revision: 23183
Log:
libxml2: remove unused BR2_PACKAGE_LIBXML2_TARGET_HEADERS option
Modified:
trunk/buildroot/package/libxml2/Config.in
Changeset:
Modified: trunk/buildroot/package/libxml2/Config.in
===================================================================
--- trunk/buildroot/package/libxml2/Config.in 2008-08-22 14:42:00 UTC (rev 23182)
+++ trunk/buildroot/package/libxml2/Config.in 2008-08-23 13:08:28 UTC (rev 23183)
@@ -3,11 +3,3 @@
help
XML C Parser
ftp://xmlsoft.org/libxml2
-
-config BR2_PACKAGE_LIBXML2_TARGET_HEADERS
- bool "libxml2 target headers"
- depends on BR2_PACKAGE_LIBXML2
- help
- XML C Parser
- ftp://xmlsoft.org/libxml2
-
^ permalink raw reply [flat|nested] 18+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libxml2
@ 2008-06-30 13:16 jacmet at uclibc.org
0 siblings, 0 replies; 18+ messages in thread
From: jacmet at uclibc.org @ 2008-06-30 13:16 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-06-30 06:16:18 -0700 (Mon, 30 Jun 2008)
New Revision: 22571
Log:
libxml: fix compilation without large file support
Modified:
trunk/buildroot/package/libxml2/libxml2.mk
Changeset:
Modified: trunk/buildroot/package/libxml2/libxml2.mk
===================================================================
--- trunk/buildroot/package/libxml2/libxml2.mk 2008-06-30 13:16:00 UTC (rev 22570)
+++ trunk/buildroot/package/libxml2/libxml2.mk 2008-06-30 13:16:18 UTC (rev 22571)
@@ -11,6 +11,10 @@
LIBXML2_INSTALL_STAGING = YES
LIBXML2_INSTALL_TARGET = YES
+ifneq ($(BR2_LARGEFILE),y)
+LIBXML2_CONF_ENV = CC="$(TARGET_CC) $(TARGET_CFLAGS) -DNO_LARGEFILE_SOURCE"
+endif
+
LIBXML2_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) --prefix=/usr \
--exec-prefix=/usr --bindir=/usr/bin \
^ permalink raw reply [flat|nested] 18+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libxml2
@ 2008-06-20 21:45 jacmet at uclibc.org
0 siblings, 0 replies; 18+ messages in thread
From: jacmet at uclibc.org @ 2008-06-20 21:45 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-06-20 14:45:27 -0700 (Fri, 20 Jun 2008)
New Revision: 22462
Log:
libxml2: strip libraries in TARGET_DIR
And cleanup libxml2.mk trailing whitespace while we're at it.
Modified:
trunk/buildroot/package/libxml2/libxml2.mk
Changeset:
Modified: trunk/buildroot/package/libxml2/libxml2.mk
===================================================================
--- trunk/buildroot/package/libxml2/libxml2.mk 2008-06-20 21:45:21 UTC (rev 22461)
+++ trunk/buildroot/package/libxml2/libxml2.mk 2008-06-20 21:45:27 UTC (rev 22462)
@@ -21,9 +21,12 @@
--with-gnu-ld --enable-shared \
--enable-static --enable-ipv6=no \
--without-debugging --without-python \
- --without-threads $(DISABLE_NLS)
+ --without-threads $(DISABLE_NLS)
+LIBXML2_DEPENDENCIES = uclibc
-LIBXML2_DEPENDENCIES = uclibc
+$(eval $(call AUTOTARGETS,package,libxml2))
-$(eval $(call AUTOTARGETS,package,libxml2))
+$(LIBXML2_HOOK_POST_INSTALL):
+ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libxml2*so*
+ touch $@
^ permalink raw reply [flat|nested] 18+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libxml2
@ 2008-03-06 18:16 ninevoltz at uclibc.org
2008-03-07 0:09 ` Ulf Samuelsson
0 siblings, 1 reply; 18+ 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:30 -0800 (Thu, 06 Mar 2008)
New Revision: 21208
Log:
updated libxml2 makefile
Modified:
trunk/buildroot/package/libxml2/libxml2.mk
Changeset:
Modified: trunk/buildroot/package/libxml2/libxml2.mk
===================================================================
--- trunk/buildroot/package/libxml2/libxml2.mk 2008-03-06 18:16:05 UTC (rev 21207)
+++ trunk/buildroot/package/libxml2/libxml2.mk 2008-03-06 18:16:30 UTC (rev 21208)
@@ -4,107 +4,26 @@
#
#############################################################
-LIBXML2_VERSION=2.6.29
-LIBXML2_SOURCE=libxml2-sources-$(LIBXML2_VERSION).tar.gz
-LIBXML2_SITE=ftp://xmlsoft.org/libxml2
-LIBXML2_DIR=$(BUILD_DIR)/libxml2-$(LIBXML2_VERSION)
-LIBXML2_CAT:=$(ZCAT)
+LIBXML2_VERSION = 2.6.29
+LIBXML2_SOURCE = libxml2-sources-$(LIBXML2_VERSION).tar.gz
+LIBXML2_SITE = ftp://xmlsoft.org/libxml2
+LIBXML2_AUTORECONF = NO
+LIBXML2_INSTALL_STAGING = YES
+LIBXML2_INSTALL_TARGET = YES
-$(DL_DIR)/$(LIBXML2_SOURCE):
- $(WGET) -P $(DL_DIR) $(LIBXML2_SITE)/$(LIBXML2_SOURCE)
+LIBXML2_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \
+ --build=$(GNU_HOST_NAME) --prefix=/usr \
+ --exec-prefix=/usr --bindir=/usr/bin \
+ --sbindir=/usr/sbin --libexecdir=/usr/lib \
+ --sysconfdir=/etc --datadir=/usr/share \
+ --localstatedir=/var --mandir=/usr/man \
+ --infodir=/usr/info --includedir=/usr/include \
+ --with-gnu-ld --enable-shared \
+ --enable-static --enable-ipv6=no \
+ --without-debugging --without-python \
+ --without-threads $(DISABLE_NLS)
-$(LIBXML2_DIR)/.unpacked: $(DL_DIR)/$(LIBXML2_SOURCE)
- $(LIBXML2_CAT) $(DL_DIR)/$(LIBXML2_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- touch $(LIBXML2_DIR)/.unpacked
-$(LIBXML2_DIR)/.configured: $(LIBXML2_DIR)/.unpacked
- (cd $(LIBXML2_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- ./configure \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --exec-prefix=/usr \
- --bindir=/usr/bin \
- --sbindir=/usr/sbin \
- --libexecdir=/usr/lib \
- --sysconfdir=/etc \
- --datadir=/usr/share \
- --localstatedir=/var \
- --mandir=/usr/man \
- --infodir=/usr/info \
- --includedir=/usr/include \
- --with-gnu-ld \
- --enable-shared \
- --enable-static \
- --enable-ipv6=no \
- --without-debugging \
- --without-python \
- --without-threads \
- $(DISABLE_NLS) \
- )
- touch $(LIBXML2_DIR)/.configured
+LIBXML2_DEPENDENCIES = uclibc
-$(STAGING_DIR)/usr/lib/libxml2.so: $(LIBXML2_DIR)/.configured
- $(MAKE) CC=$(TARGET_CC) -C $(LIBXML2_DIR)
- $(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBXML2_DIR) install
- rm -f $(STAGING_DIR)/usr/lib/libxml2.la
- $(SED) 's:prefix=/usr:prefix=$(STAGING_DIR)/usr:' \
- -e 's:includedir=/usr/include:includedir=$(STAGING_DIR)/usr/include:' \
- $(STAGING_DIR)/usr/bin/xml2-config
-
-$(TARGET_DIR)/usr/lib/libxml2.so: $(STAGING_DIR)/usr/lib/libxml2.so
- mkdir -p $(TARGET_DIR)/usr/include $(TARGET_DIR)/usr/lib
- cp -dpf $(STAGING_DIR)/usr/lib/libxml2.so* $(TARGET_DIR)/usr/lib/
- $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libxml2.so*
-
-$(TARGET_DIR)/usr/lib/libxml2.a: $(STAGING_DIR)/usr/lib/libxml2.so
- cp -dpf $(STAGING_DIR)/usr/lib/libxml2.*a $(TARGET_DIR)/usr/lib/
-
-libxml2: uclibc $(TARGET_DIR)/usr/lib/libxml2.so libxml2-headers
-
-$(STAGING_DIR)/usr/include/libxml2: $(TARGET_DIR)/usr/lib/libxml2.so
- cp -af $(LIBXML2_DIR)/include/libxml $(STAGING_DIR)/usr/include/libxml2
- touch -c $@
-
-$(TARGET_DIR)/usr/include/libxml2: libxml2-headers
- cp -af $(LIBXML2_DIR)/usr/include/libxml2 $(TARGET_DIR)/usr/include/libxml2
- touch -c $@
-
-$(TARGET_DIR)/usr/include/libxml: libxml2-headers
- ln -s libxml2/libxml $(LIBXML2_DIR)/usr/include/libxml
- touch -c $@
-
-libxml2-headers: $(STAGING_DIR)/usr/include/libxml2
-
-libxml2-target-headers: $(TARGET_DIR)/usr/include/libxml2 \
- $(TARGET_DIR)/usr/include/libxml2 \
- $(TARGET_DIR)/usr/lib/libxml2.a
-
-libxml2-source: $(DL_DIR)/$(LIBXML2_SOURCE)
-
-libxml2-clean:
- @if [ -d $(LIBXML2_DIR)/Makefile ]; then \
- $(MAKE) -C $(LIBXML2_DIR) clean; \
- fi
- rm -f $(STAGING_DIR)/usr/lib/libxml2.*
- rm -f $(TARGET_DIR)/usr/lib/libxml2.*
-
-
-libxml2-dirclean:
- rm -rf $(LIBXML2_DIR)
-
-.PHONY: libxml2-headers libxml2-target-headers
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_LIBXML2)),y)
-TARGETS+=libxml2
-endif
-ifeq ($(strip $(BR2_PACKAGE_LIBXML2_TARGET_HEADERS)),y)
-TARGETS+=libxml2-target-headers
-endif
+$(eval $(call AUTOTARGETS,package,libxml2))
^ permalink raw reply [flat|nested] 18+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libxml2
2008-03-06 18:16 ninevoltz at uclibc.org
@ 2008-03-07 0:09 ` Ulf Samuelsson
0 siblings, 0 replies; 18+ messages in thread
From: Ulf Samuelsson @ 2008-03-07 0:09 UTC (permalink / raw)
To: buildroot
> Author: ninevoltz
> Date: 2008-03-06 10:16:30 -0800 (Thu, 06 Mar 2008)
> New Revision: 21208
>
> Log:
> updated libxml2 makefile
>
> Modified:
> trunk/buildroot/package/libxml2/libxml2.mk
>
>
> Changeset:
> Modified: trunk/buildroot/package/libxml2/libxml2.mk
> ===================================================================
> --- trunk/buildroot/package/libxml2/libxml2.mk 2008-03-06 18:16:05 UTC (rev 21207)
> +++ trunk/buildroot/package/libxml2/libxml2.mk 2008-03-06 18:16:30 UTC (rev 21208)
> @@ -4,107 +4,26 @@
> #
> #############################################################
>
> -LIBXML2_VERSION=2.6.29
> -LIBXML2_SOURCE=libxml2-sources-$(LIBXML2_VERSION).tar.gz
> -LIBXML2_SITE=ftp://xmlsoft.org/libxml2
> -LIBXML2_DIR=$(BUILD_DIR)/libxml2-$(LIBXML2_VERSION)
> -LIBXML2_CAT:=$(ZCAT)
> +LIBXML2_VERSION = 2.6.29
> +LIBXML2_SOURCE = libxml2-sources-$(LIBXML2_VERSION).tar.gz
> +LIBXML2_SITE = ftp://xmlsoft.org/libxml2
> +LIBXML2_AUTORECONF = NO
> +LIBXML2_INSTALL_STAGING = YES
> +LIBXML2_INSTALL_TARGET = YES
>
Please don't add extra whitespace like this, or you
get Bernhard on your case faster than boiled aspargus.
Best Regards
Ulf Samuelsson
^ permalink raw reply [flat|nested] 18+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libxml2
@ 2007-09-23 14:23 ulf at uclibc.org
0 siblings, 0 replies; 18+ messages in thread
From: ulf at uclibc.org @ 2007-09-23 14:23 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-09-23 07:23:16 -0700 (Sun, 23 Sep 2007)
New Revision: 19972
Log:
Cleanup libxml2 directory structure
Modified:
trunk/buildroot/package/libxml2/libxml2.mk
Changeset:
Modified: trunk/buildroot/package/libxml2/libxml2.mk
===================================================================
--- trunk/buildroot/package/libxml2/libxml2.mk 2007-09-23 14:21:39 UTC (rev 19971)
+++ trunk/buildroot/package/libxml2/libxml2.mk 2007-09-23 14:23:16 UTC (rev 19972)
@@ -65,16 +65,23 @@
libxml2: uclibc $(TARGET_DIR)/usr/lib/libxml2.so libxml2-headers
-$(STAGING_DIR)/usr/include/libxml: $(TARGET_DIR)/usr/lib/libxml2.so
+$(STAGING_DIR)/usr/include/libxml2: $(TARGET_DIR)/usr/lib/libxml2.so
cp -af $(LIBXML2_DIR)/include/libxml $(STAGING_DIR)/usr/include/libxml2
+ touch -c $@
$(TARGET_DIR)/usr/include/libxml2: libxml2-headers
- cp -af $(LIBXML2_DIR)/include/libxml $(TARGET_DIR)/usr/include/libxml2
+ cp -af $(LIBXML2_DIR)/usr/include/libxml2 $(TARGET_DIR)/usr/include/libxml2
+ touch -c $@
+$(TARGET_DIR)/usr/include/libxml: libxml2-headers
+ ln -s libxml2/libxml $(LIBXML2_DIR)/usr/include/libxml
+ touch -c $@
-libxml2-headers: $(STAGING_DIR)/usr/include/libxml
+libxml2-headers: $(STAGING_DIR)/usr/include/libxml2
-libxml2-target-headers: $(TARGET_DIR)/usr/include/libxml2 $(TARGET_DIR)/usr/lib/libxml2.a
+libxml2-target-headers: $(TARGET_DIR)/usr/include/libxml2 \
+ $(TARGET_DIR)/usr/include/libxml2 \
+ $(TARGET_DIR)/usr/lib/libxml2.a
libxml2-source: $(DL_DIR)/$(LIBXML2_SOURCE)
^ permalink raw reply [flat|nested] 18+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libxml2
@ 2007-08-19 20:59 ulf at uclibc.org
0 siblings, 0 replies; 18+ messages in thread
From: ulf at uclibc.org @ 2007-08-19 20:59 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-08-19 13:59:37 -0700 (Sun, 19 Aug 2007)
New Revision: 19565
Log:
Fr?\195?\165n: Brad House <brad@mainstreetsoftworks.com>
Till: buildroot at uclibc.org
?\195?\132mne: [Buildroot] [patch] libxml2 install fails because of missing directory
Datum: Tue, 14 Aug 2007 16:34:34 -0400 (22.34 CEST)
If libxml2 is installed before $(TARGET_DIR)/usr/lib is created,
it fails because it can't copy the library over.
Also, the dependency tree is a bit messed up. libxml2.a should
only be installed if target-headers is specified, it's 4MB
on my system and the only .a file I found in my TARGET_DIR
(target-headers was not specified).
The attached patch fixes the above problems.
-Brad
Modified:
trunk/buildroot/package/libxml2/libxml2.mk
Changeset:
Modified: trunk/buildroot/package/libxml2/libxml2.mk
===================================================================
--- trunk/buildroot/package/libxml2/libxml2.mk 2007-08-19 19:28:09 UTC (rev 19564)
+++ trunk/buildroot/package/libxml2/libxml2.mk 2007-08-19 20:59:37 UTC (rev 19565)
@@ -47,11 +47,8 @@
);
touch $(LIBXML2_DIR)/.configured
-$(LIBXML2_DIR)/libxml2.la: $(LIBXML2_DIR)/.configured
- rm -f $@
+$(STAGING_DIR)/usr/lib/libxml2.so: $(LIBXML2_DIR)/.configured
$(MAKE) CC=$(TARGET_CC) -C $(LIBXML2_DIR)
-
-$(STAGING_DIR)/usr/lib/libxml2.so: $(LIBXML2_DIR)/libxml2.la
$(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBXML2_DIR) install
rm -f $(STAGING_DIR)/usr/lib/libxml2.la
$(SED) 's:prefix=/usr:prefix=$(STAGING_DIR)/usr:' \
@@ -59,17 +56,16 @@
$(STAGING_DIR)/usr/bin/xml2-config
$(TARGET_DIR)/usr/lib/libxml2.so: $(STAGING_DIR)/usr/lib/libxml2.so
+ mkdir -p $(TARGET_DIR)/usr/include $(TARGET_DIR)/usr/lib
cp -dpf $(STAGING_DIR)/usr/lib/libxml2.so* $(TARGET_DIR)/usr/lib/
$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libxml2.so*
$(TARGET_DIR)/usr/lib/libxml2.a: $(STAGING_DIR)/usr/lib/libxml2.so
- mkdir -p $(TARGET_DIR)/usr/include
cp -dpf $(STAGING_DIR)/usr/lib/libxml2.*a $(TARGET_DIR)/usr/lib/
-# cp -dpf $(STAGING_DIR)/usr/include/libxml $(TARGET_DIR)/usr/include/
libxml2: uclibc $(TARGET_DIR)/usr/lib/libxml2.so libxml2-headers
-$(STAGING_DIR)/usr/include/libxml: $(TARGET_DIR)/usr/lib/libxml2.a
+$(STAGING_DIR)/usr/include/libxml: $(TARGET_DIR)/usr/lib/libxml2.so
cp -af $(LIBXML2_DIR)/include/libxml $(STAGING_DIR)/usr/include/libxml2
$(TARGET_DIR)/usr/include/libxml2: libxml2-headers
@@ -78,7 +74,7 @@
libxml2-headers: $(STAGING_DIR)/usr/include/libxml
-libxml2-target-headers: $(TARGET_DIR)/usr/include/libxml2
+libxml2-target-headers: $(TARGET_DIR)/usr/include/libxml2 $(TARGET_DIR)/usr/lib/libxml2.a
libxml2-source: $(DL_DIR)/$(LIBXML2_SOURCE)
^ permalink raw reply [flat|nested] 18+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libxml2
@ 2007-07-24 14:12 ulf at uclibc.org
0 siblings, 0 replies; 18+ messages in thread
From: ulf at uclibc.org @ 2007-07-24 14:12 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-07-24 07:12:38 -0700 (Tue, 24 Jul 2007)
New Revision: 19249
Log:
Fix some bugs in libxml2 make
Modified:
trunk/buildroot/package/libxml2/Config.in
trunk/buildroot/package/libxml2/libxml2.mk
Changeset:
Modified: trunk/buildroot/package/libxml2/Config.in
===================================================================
--- trunk/buildroot/package/libxml2/Config.in 2007-07-24 14:10:03 UTC (rev 19248)
+++ trunk/buildroot/package/libxml2/Config.in 2007-07-24 14:12:38 UTC (rev 19249)
@@ -6,3 +6,13 @@
Requires WCHAR
ftp://xmlsoft.org/libxml2
+
+config BR2_PACKAGE_LIBXML2_TARGET_HEADERS
+ bool "libxml2 target headers"
+ default n
+ help
+ XML C Parser
+ Requires WCHAR
+
+ ftp://xmlsoft.org/libxml2
+
Modified: trunk/buildroot/package/libxml2/libxml2.mk
===================================================================
--- trunk/buildroot/package/libxml2/libxml2.mk 2007-07-24 14:10:03 UTC (rev 19248)
+++ trunk/buildroot/package/libxml2/libxml2.mk 2007-07-24 14:12:38 UTC (rev 19249)
@@ -53,11 +53,11 @@
$(STAGING_DIR)/usr/include/libxml: $(TARGET_DIR)/usr/lib/libxml2.a
cp -af $(LIBXML2_DIR)/include/libxml $(STAGING_DIR)/usr/include/libxml2
-$(TARGET_DIR)/usr/include: libxml2-headers
+$(TARGET_DIR)/usr/include/libxml2: libxml2-headers
cp -af $(LIBXML2_DIR)/include/libxml $(TARGET_DIR)/usr/include/libxml2
-libxml2-headers: $(STAGING_DIR)/usr/include/libxml2
+libxml2-headers: $(STAGING_DIR)/usr/include/libxml
libxml2-target-headers: $(TARGET_DIR)/usr/include/libxml2
^ permalink raw reply [flat|nested] 18+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libxml2
@ 2007-07-17 15:17 ulf at uclibc.org
0 siblings, 0 replies; 18+ messages in thread
From: ulf at uclibc.org @ 2007-07-17 15:17 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-07-17 08:17:42 -0700 (Tue, 17 Jul 2007)
New Revision: 19135
Log:
Copy libxml2 headers to staging_dir (and possibly target_dir)
Modified:
trunk/buildroot/package/libxml2/libxml2.mk
Changeset:
Modified: trunk/buildroot/package/libxml2/libxml2.mk
===================================================================
--- trunk/buildroot/package/libxml2/libxml2.mk 2007-07-17 13:28:31 UTC (rev 19134)
+++ trunk/buildroot/package/libxml2/libxml2.mk 2007-07-17 15:17:42 UTC (rev 19135)
@@ -46,12 +46,21 @@
$(TARGET_DIR)/usr/lib/libxml2.a: $(STAGING_DIR)/usr/lib/libxml2.so
mkdir -p $(TARGET_DIR)/usr/include
cp -dpf $(STAGING_DIR)/usr/lib/libxml2.*a $(TARGET_DIR)/usr/lib/
-# cp -dpf $(STAGING_DIR)/usr/include/mad.h $(TARGET_DIR)/usr/include/
+# cp -dpf $(STAGING_DIR)/usr/include/libxml $(TARGET_DIR)/usr/include/
-libxml2: uclibc $(TARGET_DIR)/usr/lib/libxml2.so
+libxml2: uclibc $(TARGET_DIR)/usr/lib/libxml2.so libxml2-headers
-libxml2-headers: $(TARGET_DIR)/usr/lib/libxml2.a
+$(STAGING_DIR)/usr/include/libxml: $(TARGET_DIR)/usr/lib/libxml2.a
+ cp -af $(LIBXML2_DIR)/include/libxml $(STAGING_DIR)/usr/include/libxml2
+$(TARGET_DIR)/usr/include: libxml2-headers
+ cp -af $(LIBXML2_DIR)/include/libxml $(TARGET_DIR)/usr/include/libxml2
+
+
+libxml2-headers: $(STAGING_DIR)/usr/include/libxml2
+
+libxml2-target-headers: $(TARGET_DIR)/usr/include/libxml2
+
libxml2-source: $(DL_DIR)/$(LIBXML2_SOURCE)
libxml2-clean:
@@ -64,6 +73,8 @@
libxml2-dirclean:
rm -rf $(LIBXML2_DIR)
+
+.PHONY: libxml2-headers libxml2-target-headers
#############################################################
#
# Toplevel Makefile options
@@ -73,5 +84,5 @@
TARGETS+=libxml2
endif
ifeq ($(strip $(BR2_PACKAGE_LIBXML2_TARGET_HEADERS)),y)
-TARGETS+=libxml2-headers
+TARGETS+=libxml2-target-headers
endif
^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2009-01-27 15:02 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-08-07 17:28 [Buildroot] svn commit: trunk/buildroot/package/libxml2 ulf at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2009-01-27 15:02 jacmet at uclibc.org
2008-10-10 14:41 laird at uclibc.org
2008-08-28 10:56 laird at uclibc.org
2008-08-28 11:37 ` Bernhard Reutner-Fischer
2008-08-24 7:48 jacmet at uclibc.org
2008-08-23 13:08 jacmet at uclibc.org
2008-08-23 13:08 jacmet at uclibc.org
2008-08-23 13:08 jacmet at uclibc.org
2008-08-23 13:08 jacmet at uclibc.org
2008-06-30 13:16 jacmet at uclibc.org
2008-06-20 21:45 jacmet at uclibc.org
2008-03-06 18:16 ninevoltz at uclibc.org
2008-03-07 0:09 ` Ulf Samuelsson
2007-09-23 14:23 ulf at uclibc.org
2007-08-19 20:59 ulf at uclibc.org
2007-07-24 14:12 ulf at uclibc.org
2007-07-17 15:17 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