[ptxdist] [PATCH] mtd-utils: Fix build without lzo support

[ptxdist] [PATCH] mtd-utils: Fix build without lzo support

[bernhard]

From: Bernhard Walle <bernhard@bwalle.de>

Fix the build when target mtd-utils are built with ubi tools but without
LZO.

Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
---
 ...0002-Make-liblzo-optional-for-ubifs-tools.patch |   16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/patches/mtd-utils-1.4.9/0002-Make-liblzo-optional-for-ubifs-tools.patch b/patches/mtd-utils-1.4.9/0002-Make-liblzo-optional-for-ubifs-tools.patch
index 81c63a9..eacff21 100644
--- a/patches/mtd-utils-1.4.9/0002-Make-liblzo-optional-for-ubifs-tools.patch
+++ b/patches/mtd-utils-1.4.9/0002-Make-liblzo-optional-for-ubifs-tools.patch
@@ -6,9 +6,23 @@ Based on patch from Marc Kleine-Budde <mkl@pengutronix.de>.
 
 Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
 ---
+ Makefile           |    2 +-
  mkfs.ubifs/compr.c |   17 +++++++++++++++++
- 1 files changed, 17 insertions(+), 0 deletions(-)
+ 2 files changed, 18 insertions(+), 1 deletion(-)
 
+diff --git a/Makefile b/Makefile
+index 000dc86..83eb9ce 100644
+--- a/Makefile
++++ b/Makefile
+@@ -103,7 +103,7 @@ $(call _mkdep,lib/,libmtd.a)
+ #
+ obj-mkfs.ubifs = crc16.o lpt.o compr.o devtable.o \
+ 	hashtable/hashtable.o hashtable/hashtable_itr.o
+-LDLIBS_mkfs.ubifs = -lz -llzo2 -lm -luuid
++LDLIBS_mkfs.ubifs = -lz $(LZOLDLIBS) -lm -luuid
+ $(call mkdep,mkfs.ubifs/,mkfs.ubifs,,ubi-utils/libubi.a)
+ 
+ #
 diff --git a/mkfs.ubifs/compr.c b/mkfs.ubifs/compr.c
 index 4152b6a..244d450 100644
 --- a/mkfs.ubifs/compr.c
-- 
1.7.9.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] mtd-utils: Fix build without lzo support

[Michael Olbrich]

On Fri, Mar 23, 2012 at 03:18:50PM +0100, bernhard@bwalle.de wrote:
> From: Bernhard Walle <bernhard@bwalle.de>
> 
> Fix the build when target mtd-utils are built with ubi tools but without
> LZO.

Thanks. Applied.

Michael

> Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
> ---
>  ...0002-Make-liblzo-optional-for-ubifs-tools.patch |   16 +++++++++++++++-
>  1 file changed, 15 insertions(+), 1 deletion(-)
> 
> diff --git a/patches/mtd-utils-1.4.9/0002-Make-liblzo-optional-for-ubifs-tools.patch b/patches/mtd-utils-1.4.9/0002-Make-liblzo-optional-for-ubifs-tools.patch
> index 81c63a9..eacff21 100644
> --- a/patches/mtd-utils-1.4.9/0002-Make-liblzo-optional-for-ubifs-tools.patch
> +++ b/patches/mtd-utils-1.4.9/0002-Make-liblzo-optional-for-ubifs-tools.patch
> @@ -6,9 +6,23 @@ Based on patch from Marc Kleine-Budde <mkl@pengutronix.de>.
>  
>  Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
>  ---
> + Makefile           |    2 +-
>   mkfs.ubifs/compr.c |   17 +++++++++++++++++
> - 1 files changed, 17 insertions(+), 0 deletions(-)
> + 2 files changed, 18 insertions(+), 1 deletion(-)
>  
> +diff --git a/Makefile b/Makefile
> +index 000dc86..83eb9ce 100644
> +--- a/Makefile
> ++++ b/Makefile
> +@@ -103,7 +103,7 @@ $(call _mkdep,lib/,libmtd.a)
> + #
> + obj-mkfs.ubifs = crc16.o lpt.o compr.o devtable.o \
> + 	hashtable/hashtable.o hashtable/hashtable_itr.o
> +-LDLIBS_mkfs.ubifs = -lz -llzo2 -lm -luuid
> ++LDLIBS_mkfs.ubifs = -lz $(LZOLDLIBS) -lm -luuid
> + $(call mkdep,mkfs.ubifs/,mkfs.ubifs,,ubi-utils/libubi.a)
> + 
> + #
>  diff --git a/mkfs.ubifs/compr.c b/mkfs.ubifs/compr.c
>  index 4152b6a..244d450 100644
>  --- a/mkfs.ubifs/compr.c
> -- 
> 1.7.9.4
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de