| Message ID | a8879fac-dd29-4ed5-8977-89aec49473f2@zimbra |
|---|---|
| State | Accepted |
| Commit | dcea43eba91642939c82739387147da26d572758 |
| Headers | show |
On Fri, 2013-09-27 at 11:34 -0500, Aaron Sierra wrote: > The build rule for mkfs.ubifs was missing an LDFLAGS_* variable like > mkfs.jffs2 had. This prevented mkfs.ubifs from being built against > explicit external libraries which is needed when cross-compiling. > > This also adds UUIDCPPFLAGS and UUIDLDFLAGS variables to support the > mkfs.ubifs build. > > Signed-off-by: Aaron Sierra <asierra@xes-inc.com> Looks good, pushed to mtd-utils.git, thank you!
diff --git a/Makefile b/Makefile index bf57a13..4ff8a49 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ VERSION = 1.5.0 -CPPFLAGS += -D_GNU_SOURCE -I./include -I$(BUILDDIR)/include -I./ubi-utils/include $(ZLIBCPPFLAGS) $(LZOCPPFLAGS) +CPPFLAGS += -D_GNU_SOURCE -I./include -I$(BUILDDIR)/include -I./ubi-utils/include $(ZLIBCPPFLAGS) $(LZOCPPFLAGS) $(UUIDCPPFLAGS) ifeq ($(WITHOUT_XATTR), 1) CPPFLAGS += -DWITHOUT_XATTR @@ -104,6 +104,7 @@ $(call _mkdep,lib/,libmtd.a) # obj-mkfs.ubifs = crc16.o lpt.o compr.o devtable.o \ hashtable/hashtable.o hashtable/hashtable_itr.o +LDFLAGS_mkfs.ubifs = $(ZLIBLDFLAGS) $(LZOLDFLAGS) $(UUIDLDFLAGS) LDLIBS_mkfs.ubifs = -lz -llzo2 -lm -luuid $(call mkdep,mkfs.ubifs/,mkfs.ubifs,,ubi-utils/libubi.a)
The build rule for mkfs.ubifs was missing an LDFLAGS_* variable like mkfs.jffs2 had. This prevented mkfs.ubifs from being built against explicit external libraries which is needed when cross-compiling. This also adds UUIDCPPFLAGS and UUIDLDFLAGS variables to support the mkfs.ubifs build. Signed-off-by: Aaron Sierra <asierra@xes-inc.com> --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)