summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGES5
-rw-r--r--Makefile2
-rw-r--r--docs/download.html10
-rw-r--r--docs/header.html15
-rw-r--r--docs/news.html10
-rw-r--r--fs/squashfs/Config.in3
-rw-r--r--fs/squashfs/squashfs.mk4
-rw-r--r--package/avahi/avahi.mk13
-rw-r--r--package/qt/Config.in1
-rw-r--r--package/qt/qt-4.7.2-pthread_getattr_np.patch (renamed from package/qt/qt-4.7.1-pthread_getattr_np.patch)0
-rw-r--r--package/qt/qt-4.7.2-pthread_getattr_np_webkit.patch (renamed from package/qt/qt-4.7.1-pthread_getattr_np_webkit.patch)0
-rw-r--r--package/qt/qt.mk2
-rw-r--r--package/squashfs/Config.in6
-rw-r--r--package/squashfs/squashfs-4.1-build-system-fix.patch102
-rw-r--r--package/squashfs/squashfs-4.2-no-gzip-fix.patch26
-rw-r--r--package/squashfs/squashfs.mk16
-rw-r--r--package/xerces/Config.in1
-rw-r--r--package/xerces/xerces.mk129
-rw-r--r--package/xz/xz.mk1
19 files changed, 109 insertions, 237 deletions
diff --git a/CHANGES b/CHANGES
index 73c1ad8de..e9d9a2eb9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,6 @@
-2011.02, Not yet released:
+2011.05, Not released yet:
+
+2011.02, Released February 28th, 2011:
Fixes all over the tree.
@@ -9,6 +11,7 @@
Issues resolved (http://bugs.uclibc.org):
+ #2911: Qt: Disable qt3support-option, if gui-module isn't selected
#3259: Unable to build webkit (on arm)
#3295: slang fails to build on mipsel
#3325: ffmpeg fails to build
diff --git a/Makefile b/Makefile
index 2749b14c3..7ae3787bd 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
#--------------------------------------------------------------
# Set and export the version string
-export BR2_VERSION:=2011.02-rc2
+export BR2_VERSION:=2011.05-git
# This top-level Makefile can *not* be executed in parallel
.NOTPARALLEL:
diff --git a/docs/download.html b/docs/download.html
index 6d5075bde..de7b98000 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -6,14 +6,14 @@
<p>
-The latest stable release is <b>2010.11</b>, which can be downloaded
+The latest stable release is <b>2011.02</b>, which can be downloaded
here:<p>
-<a href="/downloads/buildroot-2010.11.tar.gz">buildroot-2010.11.tar.gz</a>
+<a href="/downloads/buildroot-2011.02.tar.gz">buildroot-2011.02.tar.gz</a>
or
-<a href="/downloads/buildroot-2010.11.tar.bz2">buildroot-2010.11.tar.bz2</a>.
+<a href="/downloads/buildroot-2011.02.tar.bz2">buildroot-2011.02.tar.bz2</a>.
<p>
-
+<!--
The latest release candidate is <b>2011.02-rc2</b>, which can be
downloaded here:<p>
@@ -21,7 +21,7 @@ downloaded here:<p>
or
<a href="/downloads/buildroot-2011.02-rc2.tar.bz2">buildroot-2011.02-rc2.tar.bz2</a>.
<p>
-
+-->
This and earlier releases can always be downloaded from
<a href="/downloads/">http://buildroot.net/downloads/</a>.
diff --git a/docs/header.html b/docs/header.html
index beb85e98a..c8cb135f5 100644
--- a/docs/header.html
+++ b/docs/header.html
@@ -15,6 +15,21 @@
td.c2 {font-family: arial, helvetica, sans-serif; font-size: 80%}
td.c1 {font-family: lucida, helvetica; font-size: 248%}
</style>
+<script type="text/javascript">
+
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-21761074-1']);
+ _gaq.push(['_setDomainName', 'none']);
+ _gaq.push(['_setAllowLinker', true]);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
+
+</script>
</head>
<body>
diff --git a/docs/news.html b/docs/news.html
index a588142a9..45e28f574 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,6 +5,16 @@
<p>
<ul>
+ <li><b>28 February 2011 -- 2011.02 released</b>
+
+ <p>The stable 2011.02 release is out - Thanks to everyone
+ contributing and testing the release candidates. See the
+ <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2011.02">CHANGES</a>
+ file for more details, read the
+ <a href="http://lists.busybox.net/pipermail/buildroot/2011-February/041662.html">announcement</a>
+ and go to the <a href="/downloads/">downloads page</a> to pick up the
+ <a href="/downloads/buildroot-2011.02.tar.bz2">2011.02 release</a>.</p>
+
<li><b>24 February 2011 -- 2011.02-rc2 released</b>
<p>RC2 is out with more cleanups and bugfixes, see the <a
diff --git a/fs/squashfs/Config.in b/fs/squashfs/Config.in
index 85416becb..f13410a1c 100644
--- a/fs/squashfs/Config.in
+++ b/fs/squashfs/Config.in
@@ -37,5 +37,8 @@ config BR2_TARGET_ROOTFS_SQUASHFS4_LZMA
config BR2_TARGET_ROOTFS_SQUASHFS4_LZO
bool "lzo"
+config BR2_TARGET_ROOTFS_SQUASHFS4_XZ
+ bool "xz"
+
endchoice
endif
diff --git a/fs/squashfs/squashfs.mk b/fs/squashfs/squashfs.mk
index 7efe979e8..a680dae0f 100644
--- a/fs/squashfs/squashfs.mk
+++ b/fs/squashfs/squashfs.mk
@@ -13,9 +13,13 @@ else
ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_LZMA),y)
ROOTFS_SQUASHFS_ARGS += -comp lzma
else
+ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_XZ),y)
+ROOTFS_SQUASHFS_ARGS += -comp xz
+else
ROOTFS_SQUASHFS_ARGS += -comp gzip
endif
endif
+endif
else
ROOTFS_SQUASHFS_DEPENDENCIES = host-squashfs3
diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
index 63215572c..13ae85fc0 100644
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -10,7 +10,7 @@
# either version 2.1 of the License, or (at your option) any
# later version.
-AVAHI_VERSION = 0.6.27
+AVAHI_VERSION = 0.6.28
AVAHI_SOURCE = avahi-$(AVAHI_VERSION).tar.gz
AVAHI_SITE = http://www.avahi.org/download/
AVAHI_INSTALL_STAGING = YES
@@ -160,19 +160,8 @@ define AVAHI_INSTALL_DAEMON_INITSCRIPT
$(INSTALL) -m 0755 package/avahi/S50avahi-daemon $(TARGET_DIR)/etc/init.d/
endef
-# avahi build sys erroneously only installs dbus service if systemd is enabled
-define AVAHI_INSTALL_DAEMON_DBUS_SERVICE
- $(INSTALL) -m 0644 -D $(@D)/avahi-daemon/org.freedesktop.Avahi.service \
- $(TARGET_DIR)/usr/share/dbus-1/system-services/org.freedesktop.Avahi.service
-endef
-
ifeq ($(BR2_PACKAGE_AVAHI_DAEMON),y)
AVAHI_POST_INSTALL_TARGET_HOOKS += AVAHI_INSTALL_DAEMON_INITSCRIPT
-
-ifeq ($(BR2_PACKAGE_DBUS),y)
-AVAHI_POST_INSTALL_TARGET_HOOKS += AVAHI_INSTALL_DAEMON_DBUS_SERVICE
-endif
-
endif
$(eval $(call AUTOTARGETS,package,avahi))
diff --git a/package/qt/Config.in b/package/qt/Config.in
index e5fe325ce..3cc04f4ca 100644
--- a/package/qt/Config.in
+++ b/package/qt/Config.in
@@ -57,6 +57,7 @@ config BR2_PACKAGE_QT_LICENSE_APPROVED
config BR2_PACKAGE_QT_QT3SUPPORT
bool "Compatibility with Qt3"
+ depends on BR2_PACKAGE_QT_GUI_MODULE
help
Turns on support for older Qt3. This will create an additional
library with proxy code and increase the space required on target.
diff --git a/package/qt/qt-4.7.1-pthread_getattr_np.patch b/package/qt/qt-4.7.2-pthread_getattr_np.patch
index 5cbd7d203..5cbd7d203 100644
--- a/package/qt/qt-4.7.1-pthread_getattr_np.patch
+++ b/package/qt/qt-4.7.2-pthread_getattr_np.patch
diff --git a/package/qt/qt-4.7.1-pthread_getattr_np_webkit.patch b/package/qt/qt-4.7.2-pthread_getattr_np_webkit.patch
index e2bc18843..e2bc18843 100644
--- a/package/qt/qt-4.7.1-pthread_getattr_np_webkit.patch
+++ b/package/qt/qt-4.7.2-pthread_getattr_np_webkit.patch
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index cc90190df..e8fff73c4 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -12,7 +12,7 @@
#
######################################################################
-QT_VERSION:=4.7.1
+QT_VERSION:=4.7.2
QT_SOURCE:=qt-everywhere-opensource-src-$(QT_VERSION).tar.gz
QT_SITE:=http://get.qt.nokia.com/qt/source
QT_CAT:=$(ZCAT)
diff --git a/package/squashfs/Config.in b/package/squashfs/Config.in
index 673070862..7d0fc71c0 100644
--- a/package/squashfs/Config.in
+++ b/package/squashfs/Config.in
@@ -28,6 +28,12 @@ config BR2_PACKAGE_SQUASHFS_LZO
help
Support LZO compression algorithm
+config BR2_PACKAGE_SQUASHFS_XZ
+ bool "xz support"
+ select BR2_PACKAGE_XZ
+ help
+ Support XZ compression algorithm
+
endif
comment "squashfs requires a toolchain with LARGEFILE support"
diff --git a/package/squashfs/squashfs-4.1-build-system-fix.patch b/package/squashfs/squashfs-4.1-build-system-fix.patch
deleted file mode 100644
index 709f1de1e..000000000
--- a/package/squashfs/squashfs-4.1-build-system-fix.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-[PATCH]: allow custom EXTRA_CFLAGS/LDFLAGS/*_SUPPORT on the make cmd line
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- squashfs-tools/Makefile | 26 +++++++++++++-------------
- 1 file changed, 13 insertions(+), 13 deletions(-)
-
-Index: squashfs4.1/squashfs-tools/Makefile
-===================================================================
---- squashfs4.1.orig/squashfs-tools/Makefile
-+++ squashfs4.1/squashfs-tools/Makefile
-@@ -87,11 +87,11 @@ MKSQUASHFS_OBJS = mksquashfs.o read_fs.o
- UNSQUASHFS_OBJS = unsquashfs.o unsquash-1.o unsquash-2.o unsquash-3.o \
- unsquash-4.o swap.o compressor.o
-
--CFLAGS = $(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
-- -D_GNU_SOURCE -DCOMP_DEFAULT=\"$(COMP_DEFAULT)\" -O2 -Wall
-+CFLAGS = $(EXTRA_CFLAGS) $(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
-+ -D_GNU_SOURCE -DCOMP_DEFAULT=\"$(COMP_DEFAULT)\" -Wall
-
- LIBS =
--ifdef GZIP_SUPPORT
-+ifeq ($(GZIP_SUPPORT),1)
- CFLAGS += -DGZIP_SUPPORT
- MKSQUASHFS_OBJS += gzip_wrapper.o
- UNSQUASHFS_OBJS += gzip_wrapper.o
-@@ -99,7 +99,7 @@ LIBS += -lz
- COMPRESSORS += gzip
- endif
-
--ifdef LZMA_SUPPORT
-+ifeq ($(LZMA_SUPPORT),1)
- LZMA_OBJS = $(LZMA_DIR)/C/Alloc.o $(LZMA_DIR)/C/LzFind.o \
- $(LZMA_DIR)/C/LzmaDec.o $(LZMA_DIR)/C/LzmaEnc.o $(LZMA_DIR)/C/LzmaLib.o
- INCLUDEDIR += -I$(LZMA_DIR)/C
-@@ -109,7 +109,7 @@ UNSQUASHFS_OBJS += lzma_wrapper.o $(LZMA
- COMPRESSORS += lzma
- endif
-
--ifdef XZ_SUPPORT
-+ifeq ($(XZ_SUPPORT),1)
- CFLAGS += -DLZMA_SUPPORT
- MKSQUASHFS_OBJS += xz_wrapper.o
- UNSQUASHFS_OBJS += xz_wrapper.o
-@@ -117,7 +117,7 @@ LIBS += -llzma
- COMPRESSORS += lzma
- endif
-
--ifdef LZO_SUPPORT
-+ifeq ($(LZO_SUPPORT),1)
- CFLAGS += -DLZO_SUPPORT
- ifdef LZO_DIR
- INCLUDEDIR += -I$(LZO_DIR)/include
-@@ -129,8 +129,8 @@ LIBS += $(LZO_LIBDIR) -llzo2
- COMPRESSORS += lzo
- endif
-
--ifdef XATTR_SUPPORT
--ifdef XATTR_DEFAULT
-+ifeq ($(XATTR_SUPPORT),1)
-+ifeq ($(XATTR_DEFAULT),1)
- CFLAGS += -DXATTR_SUPPORT -DXATTR_DEFAULT
- else
- CFLAGS += -DXATTR_SUPPORT
-@@ -142,7 +142,7 @@ endif
- #
- # If LZMA_SUPPORT is specified then LZO_DIR must be specified too
- #
--ifdef LZMA_SUPPORT
-+ifeq ($(LZMA_SUPPORT),1)
- ifndef LZMA_DIR
- $(error "LZMA_SUPPORT requires LZMA_DIR to be also defined")
- endif
-@@ -151,8 +151,8 @@ endif
- #
- # Both XZ_SUPPORT and LZMA_SUPPORT cannot be specified
- #
--ifdef XZ_SUPPORT
--ifdef LZMA_SUPPORT
-+ifeq ($(XZ_SUPPORT),1)
-+ifeq ($(LZMA_SUPPORT),1)
- $(error "Both XZ_SUPPORT and LZMA_SUPPORT cannot be specified")
- endif
- endif
-@@ -175,7 +175,7 @@ endif
- all: mksquashfs unsquashfs
-
- mksquashfs: $(MKSQUASHFS_OBJS)
-- $(CC) $(MKSQUASHFS_OBJS) -lpthread -lm $(LIBS) -o $@
-+ $(CC) $(EXTRA_LDFLAGS) $(MKSQUASHFS_OBJS) -lpthread -lm $(LIBS) -o $@
-
- mksquashfs.o: mksquashfs.c squashfs_fs.h mksquashfs.h global.h sort.h \
- squashfs_swap.h xattr.h
-@@ -195,7 +195,7 @@ xattr.o: xattr.h
- read_xattrs.o: xattr.h
-
- unsquashfs: $(UNSQUASHFS_OBJS)
-- $(CC) $(UNSQUASHFS_OBJS) -lpthread -lm $(LIBS) -o $@
-+ $(CC) $(EXTRA_LDFLAGS) $(UNSQUASHFS_OBJS) -lpthread -lm $(LIBS) -o $@
-
- unsquashfs.o: unsquashfs.h unsquashfs.c squashfs_fs.h squashfs_swap.h \
- squashfs_compat.h global.h xattr.h
diff --git a/package/squashfs/squashfs-4.2-no-gzip-fix.patch b/package/squashfs/squashfs-4.2-no-gzip-fix.patch
new file mode 100644
index 000000000..4cb5f50cb
--- /dev/null
+++ b/package/squashfs/squashfs-4.2-no-gzip-fix.patch
@@ -0,0 +1,26 @@
+[PATCH] squashfs-tools: unbreak builds without gzip support
+
+The initialization of gzip_comp_ops if gzip support is disabled is
+missing 2 null pointers, causing the id element to be initialized to 0
+rather than ZLIB_COMPRESSION, which breaks all the compressor functions
+as they loop until finding the correct element or id = 0.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ squashfs-tools/compressor.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+Index: squashfs4.2/squashfs-tools/compressor.c
+===================================================================
+--- squashfs4.2.orig/squashfs-tools/compressor.c
++++ squashfs4.2/squashfs-tools/compressor.c
+@@ -27,7 +27,8 @@
+
+ #ifndef GZIP_SUPPORT
+ static struct compressor gzip_comp_ops = {
+- NULL, NULL, NULL, NULL, NULL, NULL, ZLIB_COMPRESSION, "gzip", 0
++ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ZLIB_COMPRESSION,
++ "gzip", 0
+ };
+ #else
+ extern struct compressor gzip_comp_ops;
diff --git a/package/squashfs/squashfs.mk b/package/squashfs/squashfs.mk
index 50e8964ca..7aa8ca908 100644
--- a/package/squashfs/squashfs.mk
+++ b/package/squashfs/squashfs.mk
@@ -1,13 +1,20 @@
-SQUASHFS_VERSION=4.1
+SQUASHFS_VERSION=4.2
SQUASHFS_SOURCE=squashfs$(SQUASHFS_VERSION).tar.gz
SQUASHFS_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/squashfs
-# no libattr/xz in BR
+# no libattr in BR
SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=0
ifeq ($(BR2_PACKAGE_SQUASHFS_LZMA),y)
SQUASHFS_DEPENDENCIES += xz
-SQUASHFS_MAKE_ARGS += XZ_SUPPORT=1 COMP_DEFAULT=lzma
+SQUASHFS_MAKE_ARGS += LZMA_XZ_SUPPORT=1 COMP_DEFAULT=lzma
+else
+SQUASHFS_MAKE_ARGS += LZMA_XZ_SUPPORT=0
+endif
+
+ifeq ($(BR2_PACKAGE_SQUASHFS_XZ),y)
+SQUASHFS_DEPENDENCIES += xz
+SQUASHFS_MAKE_ARGS += XZ_SUPPORT=1 COMP_DEFAULT=xz
else
SQUASHFS_MAKE_ARGS += XZ_SUPPORT=0
endif
@@ -34,7 +41,8 @@ HOST_SQUASHFS_MAKE_ARGS = \
XATTR_SUPPORT=0 \
XZ_SUPPORT=1 \
GZIP_SUPPORT=1 \
- LZO_SUPPORT=1
+ LZO_SUPPORT=1 \
+ LZMA_XZ_SUPPORT=1
define SQUASHFS_BUILD_CMDS
$(TARGET_MAKE_ENV) $(MAKE) \
diff --git a/package/xerces/Config.in b/package/xerces/Config.in
index b77794d77..374729a46 100644
--- a/package/xerces/Config.in
+++ b/package/xerces/Config.in
@@ -1,7 +1,6 @@
config BR2_PACKAGE_XERCES
bool "xerces-c++"
depends on BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR
- select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
help
Xerces-C++ is a validating XML parser written in portable C++.
diff --git a/package/xerces/xerces.mk b/package/xerces/xerces.mk
index 6e84e64a8..ffd874bf0 100644
--- a/package/xerces/xerces.mk
+++ b/package/xerces/xerces.mk
@@ -3,116 +3,25 @@
# xerces
#
#############################################################
-XERCES_VERSION:=3.0.1
-XERCES_SOURCE:=xerces-c-$(XERCES_VERSION).tar.gz
-XERCES_SITE:=http://archive.apache.org/dist/xerces/c/3/sources/
-XERCES_CAT:=$(ZCAT)
-XERCES_DIR:=$(BUILD_DIR)/xerces-c-$(XERCES_VERSION)
-LIBXERCES_BINARY:=libxerces-c-3.0.so
-
-# XERCES-C will install a number of applications
-# in $(STAGING_DIR)/usr/bin
-# We may want to copy these to the target
-
-XERCES_APPS:= \
- CreateDOMDocument \
- DOMCount \
- DOMPrint \
- EnumVal \
- MemParse \
- PParse \
- PSVIWriter \
- Redirect \
- SAX2Count \
- SAX2Print \
- SAXCount \
- SAXPrint \
- SCMPrint \
- SEnumVal \
- StdInParse
-
-# XERCES-C installs a 4.2MB worth of "*.hpp" files
-# in the
-# "dom", "framework", "internal", "parsers",
-# "sax", "sax2", "util", "validators", "xinclude"
-# directories
-
-XERCES_INCLUDES:=/usr/include/xercesc
-
-ifneq ($(BR2_ENABLE_LOCALE),y)
-XERCES_MAKE_OPT=LIBS="-liconv"
+XERCES_VERSION = 3.1.1
+XERCES_SOURCE = xerces-c-$(XERCES_VERSION).tar.gz
+XERCES_SITE = http://archive.apache.org/dist/xerces/c/3/sources/
+XERCES_MAKE = $(MAKE1)
+XERCES_INSTALL_STAGING = YES
+XERCES_CONF_OPT = --enable-shared \
+ --disable-threads \
+ --with-gnu-ld
+
+ifeq ($(BR2_PACKAGE_LIBICONV),y)
+XERCES_CONF_ENV += LIBS=-liconv
+XERCES_DEPENDENCIES += libiconv
endif
-$(DL_DIR)/$(XERCES_SOURCE):
- $(call DOWNLOAD,$(XERCES_SITE),$(XERCES_SOURCE))
-
-xerces-source: $(DL_DIR)/$(XERCES_SOURCE)
-
-$(XERCES_DIR)/.unpacked: $(DL_DIR)/$(XERCES_SOURCE)
- $(XERCES_CAT) $(DL_DIR)/$(XERCES_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-# toolchain/patch-kernel.sh $(XERCES_DIR) package/xerces/ \*.patch*
- touch $(XERCES_DIR)/.unpacked
-
-# Support for the following should be added later
-# --with-curl=
-# --with-icu=
-# --with-pkgconfigdir=
-
-$(XERCES_DIR)/.configured: $(XERCES_DIR)/.unpacked
- (cd $(XERCES_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- ./configure \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --libdir=/usr/lib \
- --libexecdir=/usr/lib \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --enable-shared \
- --disable-threads \
- --disable-network \
- --with-gnu-ld \
- )
- touch $@
-
-$(XERCES_DIR)/src/.libs/$(LIBXERCES_BINARY): $(XERCES_DIR)/.configured
- $(MAKE1) $(TARGET_CONFIGURE_OPTS) $(XERCES_MAKE_OPT) -C $(XERCES_DIR)
-
-$(STAGING_DIR)/usr/lib/$(LIBXERCES_BINARY): $(XERCES_DIR)/src/.libs/$(LIBXERCES_BINARY)
- $(MAKE) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(STAGING_DIR) \
- -C $(XERCES_DIR) install
- $(INSTALL) -c $(XERCES_DIR)/src/.libs/libxerces-c.lai \
- $(STAGING_DIR)/usr/lib/libxerces-c.la
- $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libxerces-c.la
-
-$(TARGET_DIR)/usr/lib/$(LIBXERCES_BINARY): $(STAGING_DIR)/usr/lib/$(LIBXERCES_BINARY)
- cp -a $(STAGING_DIR)/usr/lib/$(LIBXERCES_BINARY)* $(TARGET_DIR)/usr/lib
- $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/$(LIBXERCES_BINARY)
-
-xerces: $(if $(BR2_PACKAGE_LIBICONV),libiconv) $(TARGET_DIR)/usr/lib/$(LIBXERCES_BINARY)
-
-xerces-bin: $(XERCES_DIR)/usr/lib/$(LIBXERCES_BINARY)
-
-xerces-tbin: $(STAGING_DIR)/usr/lib/$(LIBXERCES_BINARY)
-
-xerces-unpacked: $(XERCES_DIR)/.unpacked
-
-xerces-clean:
- rm -rf $(STAGING_DIR)/usr/include/xercesc
- rm -f $(STAGING_DIR)/lib/libxerces*
- rm -f $(TARGET_DIR)/usr/lib/libxerces*
- -$(MAKE) -C $(XERCES_DIR) clean
-
-xerces-dirclean:
- rm -rf $(XERCES_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_XERCES),y)
-TARGETS+=xerces
+ifeq ($(BR2_PACKAGE_LIBCURL),y)
+XERCES_CONF_OPT += --enable-netaccessor-curl
+XERCES_DEPENDENCIES += libcurl
+else
+XERCES_CONF_OPT += --disable-network
endif
+
+$(eval $(call AUTOTARGETS,package,xerces))
diff --git a/package/xz/xz.mk b/package/xz/xz.mk
index 2da8fcb94..dfc0638cc 100644
--- a/package/xz/xz.mk
+++ b/package/xz/xz.mk
@@ -7,6 +7,7 @@ XZ_VERSION = 5.0.0
XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2
XZ_SITE = http://tukaani.org/xz/
XZ_INSTALL_STAGING = YES
+XZ_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
$(eval $(call AUTOTARGETS,package,xz))
$(eval $(call AUTOTARGETS,package,xz,host))
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-28 20:31:02 +0000