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

Add zlib v1.3.1 as submodule #4443

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

beutlich
Copy link
Member

@beutlich beutlich commented Aug 8, 2024

This introduces the zlib dependency as git submodule instead of copying the source files over.

Note, that 62848d3 introduced a change to "our" zlib which is not available in zlib upstream. If you see an issue here to revert that change we could also add the dependency from a custom fork, e.g. https://github.com/modelica/zlib.

Note, that the submodule is added via HTTPS, not SSH.

@beutlich beutlich added the L: C-Sources Issue addresses Modelica/Resources/C-Sources label Aug 8, 2024
@beutlich beutlich requested review from dietmarw and HansOlsson August 8, 2024 17:33
Copy link
Contributor

@HansOlsson HansOlsson left a comment

Choose a reason for hiding this comment

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

make: *** No rule to make target '../../C-Sources/zlib/adler32.c', needed by '../../C-Sources/zlib/adler32.lo'. Stop.

@dietmarw
Copy link
Member

dietmarw commented Aug 9, 2024

@HansOlsson Did you remember to run git submodule init and git submodule update before trying to run make?

@HansOlsson
Copy link
Contributor

@HansOlsson Did you remember to run git submodule init and git submodule update before trying to run make?

I will check that later.
However, the error message wasn't from my local machine, but copied from the failing CI.

I assume a similar procedure is needed there.

Copy link
Member

@dietmarw dietmarw left a comment

Choose a reason for hiding this comment

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

Tested with ./configure and make

@dietmarw
Copy link
Member

dietmarw commented Aug 9, 2024

@HansOlsson Did you remember to run git submodule init and git submodule update before trying to run make?

I will check that later. However, the error message wasn't from my local machine, but copied from the failing CI.

I assume a similar procedure is needed there.

Ah I see. OK I guess @beutlich will look into this later.

@beutlich
Copy link
Member Author

beutlich commented Aug 9, 2024

make: *** No rule to make target '../../C-Sources/zlib/adler32.c', needed by '../../C-Sources/zlib/adler32.lo'. Stop.

Yes, alread noticed but it is not obvious how to fix the Jenkinsfile. @sjoelund Please advice.

@beutlich beutlich requested a review from sjoelund August 9, 2024 13:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
L: C-Sources Issue addresses Modelica/Resources/C-Sources
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants