ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-17 10:20:02 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix LZMA/bootimage build

Browse Source 
This includes some tweaks to README.md and makefile to ensure the
directions in the former for building a bootimage actually work.
This commit is contained in:
Joel Dice 2014-07-28 09:19:39 -06:00
parent cd1a01800e
commit a1e9315fa2
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -710,7 +710,7 @@ using the OpenJDK library.)
__6.__ Build the boot and code images. __6.__ Build the boot and code images.
$ ../build/linux-i386-bootimage/bootimage-generator $ ../build/linux-i386-bootimage/bootimage-generator \
-cp stage2 \ -cp stage2 \
-bootimage bootimage-bin.o \ -bootimage bootimage-bin.o \
-codeimage codeimage-bin.o -codeimage codeimage-bin.o

4
makefile
View File

@ -1479,11 +1479,11 @@ test-args = $(test-flags) $(input)
ifneq ($(supports_avian_executable),false) ifneq ($(supports_avian_executable),false)
build: $(static-library) $(executable) $(dynamic-library) $(lzma-loader) \ build: $(static-library) $(executable) $(dynamic-library) $(lzma-loader) \
$(lzma-encoder) $(executable-dynamic) $(classpath-dep) $(test-dep) \ $(lzma-encoder) $(executable-dynamic) $(classpath-dep) $(test-dep) \
$(test-extra-dep) $(embed) $(test-extra-dep) $(embed) $(build)/classpath.jar
else else
build: $(static-library) $(dynamic-library) $(lzma-loader) \ build: $(static-library) $(dynamic-library) $(lzma-loader) \
$(lzma-encoder) $(classpath-dep) $(test-dep) \ $(lzma-encoder) $(classpath-dep) $(test-dep) \
$(test-extra-dep) $(embed) $(test-extra-dep) $(embed) $(build)/classpath.jar
endif endif
$(test-dep): $(classpath-dep) $(test-dep): $(classpath-dep)

4
src/avian/lzma-util.h
View File

@ -22,14 +22,14 @@ const unsigned Padding = 16;
class LzmaAllocator { class LzmaAllocator {
public: public:
LzmaAllocator(avian::util::Allocator* a) : a(a) LzmaAllocator(avian::util::Alloc* a) : a(a)
{ {
allocator.Alloc = allocate; allocator.Alloc = allocate;
allocator.Free = free; allocator.Free = free;
} }
ISzAlloc allocator; ISzAlloc allocator;
avian::util::Allocator* a; avian::util::Alloc* a;
static void* allocate(void* allocator, size_t size) static void* allocate(void* allocator, size_t size)
{ {

4
src/avian/lzma.h
View File

@ -22,13 +22,13 @@ class AllocOnly;
namespace vm { namespace vm {
uint8_t* decodeLZMA(System* s, uint8_t* decodeLZMA(System* s,
avian::util::AllocOnly* a, avian::util::Alloc* a,
uint8_t* in, uint8_t* in,
unsigned inSize, unsigned inSize,
unsigned* outSize); unsigned* outSize);
uint8_t* encodeLZMA(System* s, uint8_t* encodeLZMA(System* s,
avian::util::AllocOnly* a, avian::util::Alloc* a,
uint8_t* in, uint8_t* in,
unsigned inSize, unsigned inSize,
unsigned* outSize); unsigned* outSize);

2
src/lzma-decode.cpp
View File

@ -27,7 +27,7 @@ int32_t read4(const uint8_t* in)
namespace vm { namespace vm {
uint8_t* decodeLZMA(System* s, uint8_t* decodeLZMA(System* s,
avian::util::AllocOnly* a, avian::util::Alloc* a,
uint8_t* in, uint8_t* in,
unsigned inSize, unsigned inSize,
unsigned* outSize) unsigned* outSize)

2
src/lzma-encode.cpp
View File

@ -25,7 +25,7 @@ SRes myProgress(void*, UInt64, UInt64)
namespace vm { namespace vm {
uint8_t* encodeLZMA(System* s, uint8_t* encodeLZMA(System* s,
AllocOnly* a, avian::util::Alloc* a,
uint8_t* in, uint8_t* in,
unsigned inSize, unsigned inSize,
unsigned* outSize) unsigned* outSize)