diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-09-13 18:50:41 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-09-13 18:50:41 +0000 |
| commit | 97a286cb62475a3dce30c2c69d1248f0b98288c4 (patch) | |
| tree | 7196b6bac83eeae36d8f439aa28ef62d629bc26c /tools/mtd-utils/patches/100-optional_lzo.patch | |
| parent | 7ec18378a75ed98f1a1cc389aca51446bb85eae6 (diff) | |
| download | upstream-97a286cb62475a3dce30c2c69d1248f0b98288c4.tar.gz upstream-97a286cb62475a3dce30c2c69d1248f0b98288c4.tar.bz2 upstream-97a286cb62475a3dce30c2c69d1248f0b98288c4.zip | |
revert r23048 for now until Darwin compile issues have been sorted out (#7934)
SVN-Revision: 23057
Diffstat (limited to 'tools/mtd-utils/patches/100-optional_lzo.patch')
| -rw-r--r-- | tools/mtd-utils/patches/100-optional_lzo.patch | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/tools/mtd-utils/patches/100-optional_lzo.patch b/tools/mtd-utils/patches/100-optional_lzo.patch index 5af0ae23e1..d9ebc3e9b4 100644 --- a/tools/mtd-utils/patches/100-optional_lzo.patch +++ b/tools/mtd-utils/patches/100-optional_lzo.patch @@ -1,14 +1,15 @@ --- a/Makefile +++ b/Makefile -@@ -42,10 +42,15 @@ $(SYMLINKS): +@@ -36,10 +36,16 @@ $(SYMLINKS): ln -sf ../fs/jffs2/$@ $@ $(BUILDDIR)/mkfs.jffs2: $(addprefix $(BUILDDIR)/,\ -- compr_rtime.o mkfs.jffs2.o compr_zlib.o compr_lzo.o \ -+ compr_rtime.o mkfs.jffs2.o compr_zlib.o $(if $(NO_LZO),,compr_lzo.o) \ +- crc32.o compr_rtime.o mkfs.jffs2.o compr_zlib.o compr_lzo.o \ ++ crc32.o compr_rtime.o mkfs.jffs2.o compr_zlib.o $(if $(NO_LZO),,compr_lzo.o) \ compr.o rbtree.o) -LDFLAGS_mkfs.jffs2 = $(ZLIBLDFLAGS) $(LZOLDFLAGS) -LDLIBS_mkfs.jffs2 = -lz -llzo2 ++ +LDFLAGS_mkfs.jffs2 := $(ZLIBLDFLAGS) +LDLIBS_mkfs.jffs2 := -lz +ifndef NO_LZO @@ -17,5 +18,15 @@ +CPPFLAGS += -DCONFIG_JFFS2_LZO +endif - $(BUILDDIR)/jffs2reader: $(BUILDDIR)/jffs2reader.o - LDFLAGS_jffs2reader = $(ZLIBLDFLAGS) $(LZOLDFLAGS) + $(BUILDDIR)/flash_eraseall: $(BUILDDIR)/crc32.o $(BUILDDIR)/flash_eraseall.o + +--- a/compr.h ++++ b/compr.h +@@ -18,7 +18,6 @@ + + #define CONFIG_JFFS2_ZLIB + #define CONFIG_JFFS2_RTIME +-#define CONFIG_JFFS2_LZO + + #define JFFS2_RUBINMIPS_PRIORITY 10 + #define JFFS2_DYNRUBIN_PRIORITY 20 |