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.

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

zstd: clean up template. #45817

Merged
merged 1 commit into from
Aug 31, 2023
Merged

Conversation

leahneukirchen
Copy link
Member

The zstd template had multiple issues:

  • Since not all targets where built in do_build, compilation happened in do_install.
  • Both zstd(1) and pzstd(1) statically linked libzstd.
  • The libzstd.a library was meant to have multi-threading support, but was overwritten by a single-threaded version as a side-effect.

We patch pzstd to use dynamic linking and use "zstd-dll" for zstd.

In the future we may want to consider using cmake or ninja, but as it's a bootstrap package I've kept it on make.

The zstd template had multiple issues:

- Since not all targets where built in do_build, compilation happened in
  do_install.
- Both zstd(1) and pzstd(1) statically linked libzstd.
- The libzstd.a library was meant to have multi-threading support,
  but was overwritten by a single-threaded version as a side-effect.

We patch pzstd to use dynamic linking and use "zstd-dll" for zstd.
@sgn
Copy link
Member

sgn commented Aug 31, 2023

We can use cmake build-style because that one use cmake-bootstrap, which vendored their own version of libzstd;
and either:

  • split the build for bootstrap; or
  • require cmake in bootstrap (foreign) environment

@sgn
Copy link
Member

sgn commented Aug 31, 2023

Ah, cmake can find its modules by relative path, too. I may look into add cmake-bootstrap to the bootstrap path.

@leahneukirchen
Copy link
Member Author

AFAICS nothing else uses cmake yet, so let's stick to the Makefile for now?

@sgn
Copy link
Member

sgn commented Aug 31, 2023

1.5.5 doesn't support cmake yet,anyway. So, we must stick with Makefile. There's ccache that uses cmake, but we delayed it until stage1

@leahneukirchen leahneukirchen merged commit 90e2694 into void-linux:master Aug 31, 2023
8 checks passed
@leahneukirchen leahneukirchen deleted the zstd-cleanup branch August 31, 2023 15:56
@leahneukirchen
Copy link
Member Author

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants