From: bernhard@bwalle.de
To: ptxdist@pengutronix.de
Cc: Bernhard Walle <bernhard@bwalle.de>
Subject: [ptxdist] [PATCH] mtd-utils: Fix build without lzo support
Date: Fri, 23 Mar 2012 15:18:50 +0100 [thread overview]
Message-ID: <1332512330-20101-1-git-send-email-bernhard@bwalle.de> (raw)
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
next reply other threads:[~2012-03-23 14:22 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-23 14:18 bernhard [this message]
2012-03-24 9:56 ` Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1332512330-20101-1-git-send-email-bernhard@bwalle.de \
--to=bernhard@bwalle.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox