Skip to contentSkip to conversation

package/libxml2: add optional LZMA support

PATCH New Yann E. MORIN 2 participants 2 messages Mar 24, 2015

lore
Share & tools
lore

Yann E. MORIN

author
#0 lore raw

PATCH v3 1/1 package/libxml2: add optional LZMA support

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" <[email protected]>

---
Changes v2 -> v3;
- actually use pkg-config

---
 package/libxml2/libxml2.mk | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
package/libxml2/libxml2.mk +8 -1
index 354c178..264e437 100644
@@ -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
+else
+LIBXML2_CONF_OPTS += --without-lzma
+endif
+
 LIBXML2_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv)
 
 ifeq ($(BR2_ENABLE_LOCALE)$(BR2_PACKAGE_LIBICONV),y)
Signature · 1 line
1.9.1
Applied
#1 lore raw

PATCH v3 1/1 package/libxml2: add optional LZMA support

Dear Yann E. MORIN,

Quoted 7 lines · Yann E. MORIN

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" <[email protected]>

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com