296294 - Incorporate libbz2 (bzip2 library) into the source tree

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Darin Fisher]

Incorporate libbz2 (bzip2 library) into the source tree

This is needed by the new update system.  And, I suspect that it would be handy
to expose as a stream converter in the future.

Brendan agreed to modules/libbz2 for this over IRC.  Patch coming up.

Comment 1

[Darin Fisher]

Attachment: v1 patch

Comment 2

[Darin Fisher]

This is version 1.0.3 of bzip2 (which according to www.bzip.org is the latest
version).

Comment 3

[Hixie (not reading bugmail)]

(also... NPL license?)

Comment 4

[Benjamin Smedberg]

Comment on attachment 185075 [details] [diff] [review]
v1 patch

>Index: libbz2/Makefile.in

>+# The contents of this file are subject to the Netscape Public

MPL tri-license

Why are we making a modules/libbz2/src directory when the headers and source
files are intermingled? Why not just put it all in modules/libbz2 directly?

>Index: libbz2/src/Makefile.in

>+# The contents of this file are subject to the Netscape Public

Ditto.

>+# BIGFILES
>+DEFINES	+= -D_FILE_OFFSET_BITS=64

Why? I don't see either of these being used anywhere.

>+FORCE_STATIC_LIB = 1

Where is this code being linked? I don't think we want LIBXUL_LIBRARY for code
that is not linked into libxul.so (I'm pretty sure that LIBXUL_LIBRARY sets
FORCE_USE_PIC, and that this code is only linked into standalone binaries).

I did not review any of the bzip code, but I assume it's copied verbatim?

Comment 5

[Darin Fisher]

> Why are we making a modules/libbz2/src directory when the headers and source
> files are intermingled? Why not just put it all in modules/libbz2 directly?

following convention of modules/zlib.  not a good idea?


> >+# BIGFILES
> >+DEFINES	+= -D_FILE_OFFSET_BITS=64
> 
> Why? I don't see either of these being used anywhere.

I just copied the compile line that I observed while building libbz2 from the
bzip2 sources.  I should have checked to see which source files reference this
define.  Thanks for checking!


> >+FORCE_STATIC_LIB = 1
> 
> Where is this code being linked? I don't think we want LIBXUL_LIBRARY for code
> that is not linked into libxul.so (I'm pretty sure that LIBXUL_LIBRARY sets
> FORCE_USE_PIC, and that this code is only linked into standalone binaries).

I only want this to be built as a static library.  It will eventually be
something we link into libxul once we implement a nsIStreamConverter for this. 
But, we can definitely punt on supporting that.  I probably just copied this
Makefile from the zlib one and hacked it.  What should I have here in order to
get a simple static library output into dist/lib?


> I did not review any of the bzip code, but I assume it's copied verbatim?

Yes.

Comment 6

[Christian :Biesinger (don't email me, ping me on IRC)]

err, -D_FILE_OFFSET_BITS=64 is checked by libc, at least by gnu's...

Comment 7

[Darin Fisher]

Attachment: v1.1 patch

Final patch with bsmedberg's nits applied.

Brendan: I'm just looking for directory structure approval from you.  a= would
be appreciated too.

Comment 8

[Brendan Eich [:brendan]]

Comment on attachment 185209 [details] [diff] [review]
v1.1 patch

sr+a=me.

/be

Comment 9

[Darin Fisher]

fixed-on-trunk