| Message ID | 1427233787-8456-1-git-send-email-yann.morin.1998@free.fr |
|---|---|
| State | Changes Requested |
| Headers | show |
All, On 2015-03-24 22:49 +0100, Yann E. MORIN spake thusly: > LZMA support is provided by xz, since liblzma is long dead. > > Contrary to zlib, liblzma uses pkg-config, so we do not need to add the > full path to libzma. > > Reported-by: vdm on IRC > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> > --- > package/libxml2/libxml2.mk | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk > index 354c178..6bd73a4 100644 > --- a/package/libxml2/libxml2.mk > +++ b/package/libxml2/libxml2.mk > @@ -16,7 +16,7 @@ ifneq ($(BR2_LARGEFILE),y) > LIBXML2_CONF_ENV = CC="$(TARGET_CC) $(TARGET_CFLAGS) -DNO_LARGEFILE_SOURCE" > endif > > -LIBXML2_CONF_OPTS = --with-gnu-ld --without-python --without-debug --without-lzma > +LIBXML2_CONF_OPTS = --with-gnu-ld --without-python --without-debug > > HOST_LIBXML2_DEPENDENCIES = host-pkgconf > LIBXML2_DEPENDENCIES = host-pkgconf > @@ -30,6 +30,13 @@ else > LIBXML2_CONF_OPTS += --without-zlib > endif > > +ifeq ($(BR2_PACKAGE_XZ),y) > +LIBXML2_DEPENDENCIES += xz > +LIBXML2_CONF_OPTS += --with-lzma=$(STAGING_DIR)/usr Grr... I once again forgot to commit before I sent the patch... Sorry for the noise... :-/ Regards, Yann E. MORIN. > +else > +LIBXML2_CONF_OPTS += --without-lzma > +endif > + > LIBXML2_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) > > ifeq ($(BR2_ENABLE_LOCALE)$(BR2_PACKAGE_LIBICONV),y) > -- > 1.9.1 >
diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index 354c178..6bd73a4 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -16,7 +16,7 @@ ifneq ($(BR2_LARGEFILE),y) LIBXML2_CONF_ENV = CC="$(TARGET_CC) $(TARGET_CFLAGS) -DNO_LARGEFILE_SOURCE" endif -LIBXML2_CONF_OPTS = --with-gnu-ld --without-python --without-debug --without-lzma +LIBXML2_CONF_OPTS = --with-gnu-ld --without-python --without-debug HOST_LIBXML2_DEPENDENCIES = host-pkgconf LIBXML2_DEPENDENCIES = host-pkgconf @@ -30,6 +30,13 @@ else LIBXML2_CONF_OPTS += --without-zlib endif +ifeq ($(BR2_PACKAGE_XZ),y) +LIBXML2_DEPENDENCIES += xz +LIBXML2_CONF_OPTS += --with-lzma=$(STAGING_DIR)/usr +else +LIBXML2_CONF_OPTS += --without-lzma +endif + LIBXML2_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) ifeq ($(BR2_ENABLE_LOCALE)$(BR2_PACKAGE_LIBICONV),y)
LZMA support is provided by xz, since liblzma is long dead. Contrary to zlib, liblzma uses pkg-config, so we do not need to add the full path to libzma. Reported-by: vdm on IRC Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> --- package/libxml2/libxml2.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)