Skip to content

Conversation

@Vollstrecker
Copy link
Contributor

Now components are done as expected and used in minizip and all tests.

  • If someone wants to link specifically against a shared or static lib searching for only that one is supported.
  • If someone doesn't specify what's needed, both versions have to be there (like default build without any changes)

For examples test/.cmake.in and contrib/minizip/test/.cmake.in are designed to show the different combinations and tests for these combinations are also added.

Superseeds #1113
@zero-rp: I guess this solves your problem.

@madler
Copy link
Owner

madler commented Jan 28, 2026

@Vollstrecker Please check conflicts.

@Vollstrecker Vollstrecker force-pushed the components branch 2 times, most recently from d574b1b to ea8111e Compare January 30, 2026 15:34
@Vollstrecker
Copy link
Contributor Author

Should be done now. I also added the checks for the contribs, mainly to always see if they could be split into a separate repo to not get another CVE regarding them.

@madler
Copy link
Owner

madler commented Jan 31, 2026

Thanks! Though it still says there are conflicts.

@Vollstrecker
Copy link
Contributor Author

Vollstrecker commented Jan 31, 2026

Srange, I rebased my develop fork and rebased that one here on that, but all I see "All checks have passed" and "No conflicts with base branch", so it also doesn't offer me anything to solve.

If you tell me your workflow, I could try to reproduce it, I reviewed all the changes and they shouldn't affect any other parts, so it should be safe for you to just copy the CHANGED files over and do some kind of manual squash merge.

@madler
Copy link
Owner

madler commented Jan 31, 2026

I'm just looking at this page right here. It says: "This branch cannot be rebased due to conflicts". (I also see "All checks have passed".)

@madler
Copy link
Owner

madler commented Jan 31, 2026

Screenshot 2026-01-31 at 1 44 22 PM

@Vollstrecker
Copy link
Contributor Author

Maximum confusion, I think.

screen

@madler
Copy link
Owner

madler commented Feb 1, 2026

These do indeed fail to apply when I do them all at once. I will do them one at a time, and try to resolve the conflicts.

@madler
Copy link
Owner

madler commented Feb 1, 2026

Ok, I was able to apply 15 out of 17 commits. They have been pushed here on develop. I think the easiest thing now would be for you to use your source files state as compared to develop, and make a new pull request to take it the rest of the way there. Thanks.

@zero-rp
Copy link

zero-rp commented Feb 1, 2026

Now components are done as expected and used in minizip and all tests.

  • If someone wants to link specifically against a shared or static lib searching for only that one is supported.
  • If someone doesn't specify what's needed, both versions have to be there (like default build without any changes)

For examples test/.cmake.in and contrib/minizip/test/.cmake.in are designed to show the different combinations and tests for these combinations are also added.

Superseeds #1113 @zero-rp: I guess this solves your problem.

The latest develop branch currently solves my problem. Thanks.

@madler madler closed this Feb 1, 2026
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.

3 participants