From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from moutng.kundenserver.de ([212.227.17.9]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1SB5Nx-0001J6-VO for ptxdist@pengutronix.de; Fri, 23 Mar 2012 15:22:38 +0100 From: bernhard@bwalle.de Date: Fri, 23 Mar 2012 15:18:50 +0100 Message-Id: <1332512330-20101-1-git-send-email-bernhard@bwalle.de> Subject: [ptxdist] [PATCH] mtd-utils: Fix build without lzo support Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de Cc: Bernhard Walle From: Bernhard Walle Fix the build when target mtd-utils are built with ubi tools but without LZO. Signed-off-by: Bernhard Walle --- ...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 . Signed-off-by: Bernhard Walle --- + 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