Modify

Opened 6 years ago

Closed 6 years ago

#10459 closed defect (fixed)

lzma-old

Reported by: patrick@… Owned by: developers
Priority: normal Milestone: Backfire 10.03.1
Component: toolchain Version: Backfire 10.03.1 RC6
Keywords: lzma-old makro Cc:

Description

lzma-old does not compile on gentoo

make[4]: Entering directory `/home/patrick/ff-build/backfire/ar71xx/build_dir/host/lzma-4.32/C/7zip/Compress/LZMA_Lib'
g++ -O3 -Wall -c  -I ../../../ ZLib.cpp
ZLib.cpp:183: error: expected initializer before 'OF'
make[4]: *** [ZLib.o] Error 1

The freetz people have the same problem.
http://www.ip-phone-forum.de/showthread.php?t=240533&page=1

This Patch works for me.

Index: tools/lzma-old/patches/100-lzma_zlib.patch
===================================================================
--- tools/lzma-old/patches/100-lzma_zlib.patch	(Revision 29253)
+++ tools/lzma-old/patches/100-lzma_zlib.patch	(Arbeitskopie)
@@ -311,9 +311,9 @@
 +	UInt64 m_offset;
 +};
 +
-+ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
++ZEXTERN int ZEXPORT compress2 (Bytef *dest,   uLongf *destLen,
 +                                  const Bytef *source, uLong sourceLen,
-+                                  int level))
++                                  int level)
 +{
 +	CInMemoryStream *inStreamSpec = new CInMemoryStream(source, sourceLen);
 +	CMyComPtr<ISequentialInStream> inStream = inStreamSpec;
@@ -374,8 +374,8 @@
 +	return Z_OK;
 +}
 +
-+ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
-+                                   const Bytef *source, uLong sourceLen))
++ZEXTERN int ZEXPORT uncompress (Bytef *dest,   uLongf *destLen,
++                                   const Bytef *source, uLong sourceLen)
 +{
 +	CInMemoryStream *inStreamSpec = new CInMemoryStream(source, sourceLen);
 +	CMyComPtr<ISequentialInStream> inStream = inStreamSpec;

Attachments (1)

tools-lzma-old.patch (1.2 KB) - added by patrick@… 6 years ago.

Download all attachments as: .zip

Change History (3)

Changed 6 years ago by patrick@…

comment:1 Changed 6 years ago by patrick@…

Duplicate #10253

PLS Bakport to branch

comment:2 Changed 6 years ago by nico

  • Resolution set to fixed
  • Status changed from new to closed

The fix from r28502 was merged to backfire in r29255

Add Comment

Modify Ticket

Action
as closed .
The resolution will be deleted. Next status will be 'reopened'.
Author


E-mail address and user name can be saved in the Preferences.

 
Note: See TracTickets for help on using tickets.