[meta-oe][PATCH] xdelta3: add optional lzma support

[meta-oe][PATCH] xdelta3: add optional lzma support

[Matthieu Crapet]

Using PACKAGECONFIG. Disabled by default.

Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
---
 meta-oe/recipes-support/xdelta/xdelta3_3.0.8.bb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta-oe/recipes-support/xdelta/xdelta3_3.0.8.bb b/meta-oe/recipes-support/xdelta/xdelta3_3.0.8.bb
index 16a72ee..f3b4754 100644
--- a/meta-oe/recipes-support/xdelta/xdelta3_3.0.8.bb
+++ b/meta-oe/recipes-support/xdelta/xdelta3_3.0.8.bb
@@ -13,3 +13,7 @@ SRC_URI[md5sum] = "c3ae3286ce4193de8e03d5bcaccf3bc3"
 SRC_URI[sha256sum] = "3a86f29c95664fb44b8a40ff22d9bcc3e87aa8c01f0ff75931a7fa78ed3d2e55"
 
 inherit autotools
+
+# Optional secondary compression
+PACKAGECONFIG ?= ""
+PACKAGECONFIG[lzma] = ",,xz"
-- 
1.8.5.4

Re: [meta-oe][PATCH] xdelta3: add optional lzma support

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Matthieu Crapet schreef op 07-05-14 13:43:
> Using PACKAGECONFIG. Disabled by default.
> 
> Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com> --- 
> meta-oe/recipes-support/xdelta/xdelta3_3.0.8.bb | 4 ++++ 1 file changed, 
> 4 insertions(+)
> 
> diff --git a/meta-oe/recipes-support/xdelta/xdelta3_3.0.8.bb 
> b/meta-oe/recipes-support/xdelta/xdelta3_3.0.8.bb index 16a72ee..f3b4754 
> 100644 --- a/meta-oe/recipes-support/xdelta/xdelta3_3.0.8.bb +++ 
> b/meta-oe/recipes-support/xdelta/xdelta3_3.0.8.bb @@ -13,3 +13,7 @@ 
> SRC_URI[md5sum] = "c3ae3286ce4193de8e03d5bcaccf3bc3" SRC_URI[sha256sum]
> = "3a86f29c95664fb44b8a40ff22d9bcc3e87aa8c01f0ff75931a7fa78ed3d2e55"
> 
> inherit autotools + +# Optional secondary compression +PACKAGECONFIG ?= 
> "" +PACKAGECONFIG[lzma] = ",,xz"

If there's not configure switch for it, add it to DEPENDS to avoid suprises.

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFTaiTLMkyGM64RGpERAglxAKCBVh+CyLipm+C+VJeQFQ3UZc1LSQCfdeVH
3sFkaMpsdr6M977BEM4EVDQ=
=Gnvt
-----END PGP SIGNATURE-----

Re: [meta-oe][PATCH] xdelta3: add optional lzma support

[Matthieu CRAPET]

Hi,

I understand that depending if lzma.h is previously installed or not, the result binary is different.
So you recommend to enable lzma ?

By the way, could you reexplain if I should write:
PACKAGECONFIG ?= "lzma"
Or
PACKAGECONFIG ??= "lzma"

Regards,
Matt


-----Message d'origine-----
De : openembedded-devel-bounces@lists.openembedded.org [mailto:openembedded-devel-bounces@lists.openembedded.org] De la part de Koen Kooi
Envoyé : mercredi 7 mai 2014 14:19
À : openembedded-devel@lists.openembedded.org
Objet : Re: [oe] [meta-oe][PATCH] xdelta3: add optional lzma support

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Matthieu Crapet schreef op 07-05-14 13:43:
> Using PACKAGECONFIG. Disabled by default.
> 
> Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com> --- 
> meta-oe/recipes-support/xdelta/xdelta3_3.0.8.bb | 4 ++++ 1 file 
> changed,
> 4 insertions(+)
> 
> diff --git a/meta-oe/recipes-support/xdelta/xdelta3_3.0.8.bb
> b/meta-oe/recipes-support/xdelta/xdelta3_3.0.8.bb index 
> 16a72ee..f3b4754
> 100644 --- a/meta-oe/recipes-support/xdelta/xdelta3_3.0.8.bb +++ 
> b/meta-oe/recipes-support/xdelta/xdelta3_3.0.8.bb @@ -13,3 +13,7 @@ 
> SRC_URI[md5sum] = "c3ae3286ce4193de8e03d5bcaccf3bc3" 
> SRC_URI[sha256sum] = "3a86f29c95664fb44b8a40ff22d9bcc3e87aa8c01f0ff75931a7fa78ed3d2e55"
> 
> inherit autotools + +# Optional secondary compression +PACKAGECONFIG 
> ?= "" +PACKAGECONFIG[lzma] = ",,xz"

If there's not configure switch for it, add it to DEPENDS to avoid suprises.

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFTaiTLMkyGM64RGpERAglxAKCBVh+CyLipm+C+VJeQFQ3UZc1LSQCfdeVH
3sFkaMpsdr6M977BEM4EVDQ=
=Gnvt
-----END PGP SIGNATURE-----

--
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Re: [meta-oe][PATCH] xdelta3: add optional lzma support

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1221 bytes --]

On Wed, May 07, 2014 at 01:43:27PM +0200, Matthieu Crapet wrote:
> Using PACKAGECONFIG. Disabled by default.

It's not disabled by default, it's autodetected by default and that's
not acceptable.

> Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
> ---
>  meta-oe/recipes-support/xdelta/xdelta3_3.0.8.bb | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/meta-oe/recipes-support/xdelta/xdelta3_3.0.8.bb b/meta-oe/recipes-support/xdelta/xdelta3_3.0.8.bb
> index 16a72ee..f3b4754 100644
> --- a/meta-oe/recipes-support/xdelta/xdelta3_3.0.8.bb
> +++ b/meta-oe/recipes-support/xdelta/xdelta3_3.0.8.bb
> @@ -13,3 +13,7 @@ SRC_URI[md5sum] = "c3ae3286ce4193de8e03d5bcaccf3bc3"
>  SRC_URI[sha256sum] = "3a86f29c95664fb44b8a40ff22d9bcc3e87aa8c01f0ff75931a7fa78ed3d2e55"
>  
>  inherit autotools
> +
> +# Optional secondary compression
> +PACKAGECONFIG ?= ""
> +PACKAGECONFIG[lzma] = ",,xz"
> -- 
> 1.8.5.4
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [meta-oe][PATCH] xdelta3: add optional lzma support

[Khem Raj]

On Wed, May 7, 2014 at 4:43 AM, Matthieu Crapet
<Matthieu.Crapet@ingenico.com> wrote:
> +
> +# Optional secondary compression
> +PACKAGECONFIG ?= ""
> +PACKAGECONFIG[lzma] = ",,xz"

consider when xz comes as indirect dependency via some other package
then this packageconfig will become useless
IMO you have to also fix the package itself to explicitly
enable/disable the lzma support and then adding packageconfig
will be effective.

[meta-oe][PATCH v2] xdelta3: add optional lzma support

[Matthieu Crapet]

Using PACKAGECONFIG. Disabled by default.

Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
---
 .../files/with-liblzma-configure-option.patch      | 55 ++++++++++++++++++++++
 meta-oe/recipes-support/xdelta/xdelta3_3.0.8.bb    |  8 +++-
 2 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-support/xdelta/files/with-liblzma-configure-option.patch

diff --git a/meta-oe/recipes-support/xdelta/files/with-liblzma-configure-option.patch b/meta-oe/recipes-support/xdelta/files/with-liblzma-configure-option.patch
new file mode 100644
index 0000000..4b99290
--- /dev/null
+++ b/meta-oe/recipes-support/xdelta/files/with-liblzma-configure-option.patch
@@ -0,0 +1,55 @@
+Upstream-Status: Pending, Submitted
+http://code.google.com/p/xdelta/issues/detail?id=178
+
+xdelta3: add --with-liblzma configure option
+
+As xdelta3 can be compiled with or without liblzma external library, make it configurable.
+Default is autodetect (unchanged behavior).
+
+Signed-off-by: Matthieu Crapet <mcrapet@gmail.com>
+---
+ configure.ac | 21 +++++++++++++++++++--
+ 1 file changed, 19 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 3b430d7..8c53ba8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -8,8 +8,6 @@ AM_INIT_AUTOMAKE([1.9 no-define foreign tar-ustar])
+ AX_CHECK_ALIGNED_ACCESS_REQUIRED
+ AC_PROG_CC
+ AC_PROG_CXX
+-AC_CHECK_HEADERS([lzma.h])
+-AC_CHECK_LIB(lzma, lzma_easy_buffer_encode)
+ AC_CHECK_SIZEOF(size_t)
+ #AM_PATH_PYTHON(,, [:])
+ #AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
+@@ -22,6 +20,25 @@ AC_ARG_ENABLE(debug-symbols,
+    AS_HELP_STRING(--enable-debug-symbols,[Build with debug symbols (default is NO)]),,enableval=no)
+ AM_CONDITIONAL([DEBUG_SYMBOLS], [test ${enableval} = "yes"])
+ 
++AC_ARG_WITH(
++    [liblzma],
++    [AC_HELP_STRING(
++        [--with-liblzma],
++        [build with liblzma support @<:@default=autodetect@:>@])],
++    [USE_LIBLZMA=$withval],
++    [USE_LIBLZMA=auto])
++
++if test "x$USE_LIBLZMA" != xno ; then
++    AC_CHECK_HEADERS([lzma.h],,[
++        if test "x$with_liblzma" = xyes ; then
++            AC_MSG_FAILURE([liblzma includes was not found])
++        fi])
++    AC_CHECK_LIB([lzma], [lzma_easy_buffer_encode],,[
++        if test "x$with_liblzma" = xyes ; then
++            AC_MSG_FAILURE([liblzma library was not found])
++        fi])
++fi
++
+ AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_FILES([Makefile])
+ AC_OUTPUT
+-- 
+1.8.5.4
+
diff --git a/meta-oe/recipes-support/xdelta/xdelta3_3.0.8.bb b/meta-oe/recipes-support/xdelta/xdelta3_3.0.8.bb
index 16a72ee..6160c81 100644
--- a/meta-oe/recipes-support/xdelta/xdelta3_3.0.8.bb
+++ b/meta-oe/recipes-support/xdelta/xdelta3_3.0.8.bb
@@ -8,8 +8,14 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
 
 SRC_URI = "http://xdelta.googlecode.com/files/${BPN}-${PV}.tar.xz \
-           file://compilation-fix.patch"
+           file://compilation-fix.patch \
+           file://with-liblzma-configure-option.patch \
+"
 SRC_URI[md5sum] = "c3ae3286ce4193de8e03d5bcaccf3bc3"
 SRC_URI[sha256sum] = "3a86f29c95664fb44b8a40ff22d9bcc3e87aa8c01f0ff75931a7fa78ed3d2e55"
 
 inherit autotools
+
+# Optional secondary compression
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[lzma] = "--with-liblzma,--without-liblzma,xz"
-- 
1.8.5.4