Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: meson build #120

Open
wants to merge 25 commits into
base: master
Choose a base branch
from
+1,594 −0
Open

WIP: meson build #120

Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
63e93f5
WIP: meson build
vtorri May 2, 2024
fc52493
improve meson code
vtorri May 2, 2024
72f696e
remove '== true' or '== false', use 'in' instead of 'contains()'
vtorri May 3, 2024
8f0731e
remove now useless 'res', formatting
vtorri May 3, 2024
7056bbc
remove uselesss match_finders array, + fix
vtorri May 3, 2024
d823821
remove uselesss checks array
vtorri May 3, 2024
3f29010
remove outer if
vtorri May 3, 2024
070a65d
change project name to 'xz-utils' to avoid space in the dist tarball …
vtorri May 4, 2024
132cde1
use get_option() instead of array
vtorri May 4, 2024
fc9655e
fix copy-paste typo
vtorri May 4, 2024
0ffc20d
fix posix_fadvise() detection
vtorri May 9, 2024
aca1aa2
change tarball name to 'xz' as recommended in PACKAGERS file
vtorri May 9, 2024
ae73fa4
add xzdec and lzmadec + a couple of improvements
vtorri May 15, 2024
0f2859d
add xz tool + some fixes
vtorri May 16, 2024
96e2d96
remove uint32_t check
vtorri May 16, 2024
f51a11f
move C99 header macros to top level meson.build, unconditionally set …
vtorri May 16, 2024
be2a23a
indent #
vtorri May 16, 2024
8a7b9b1
fix description of 'unsafe-type-punning' option
vtorri May 16, 2024
a83a638
use cc.has_function_attribute instead of compile C code
vtorri May 16, 2024
859f821
use .set() method instead of .set10(), except for visibility macro
vtorri May 18, 2024
fb6b458
change description of macro, define _GNU_SOURCE and __EXTENSIONS__
vtorri May 18, 2024
24ad34e
remove check of wchar.h for wcwidth()
vtorri May 18, 2024
efcb02e
remove double # at the top of meson.build files
vtorri May 18, 2024
d45e486
add lzmainfo and scripts, plus some fixes
vtorri May 22, 2024
7105a71
add C tests
vtorri May 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 11 additions & 19 deletions src/liblzma/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,26 +155,18 @@ if ('sha256' in get_option('checks')) and (not get_option('external-sha256'))
]
endif

if ('lzma1' in get_option('encoders')) or
('lzma1' in get_option('decoders')) or
('lzma2' in get_option('encoders')) or
('lzma2' in get_option('decoders'))

# lz/Makefile.inc
if ('lzma1' in get_option('encoders')) or
('lzma2' in get_option('encoders'))
lzma_src += [
'lz/lz_encoder.c',
'lz/lz_encoder_mf.c'
]
endif
# lz/Makefile.inc
if ('lzma1' in get_option('encoders')) or ('lzma2' in get_option('encoders'))
lzma_src += [
'lz/lz_encoder.c',
'lz/lz_encoder_mf.c'
]
endif

if ('lzma1' in get_option('encoders')) or
('lzma2' in get_option('encoders'))
lzma_src += [
'lz/lz_decoder.c'
]
endif
if ('lzma1' in get_option('decoders')) or ('lzma2' in get_option('decoders'))
lzma_src += [
'lz/lz_decoder.c'
]
endif

if ('lzma1' in get_option('encoders')) or ('lzma1' in get_option('decoders'))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if things like this should be factored out into their own variable, like:

have_lzma1_encoder = ...

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i wonder if lzma1 and lzma2 should be not an option, but just required, as it's the main purpose of xz. That would simplify the build a LOT...

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As discussed on IRC, it's fine to make LZMA1 and LZMA2 mandatory. Having a way to disable encoder support entirely is useful though.

Expand Down