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

zlib: add package #3455

Merged
3 commits merged into from
Apr 14, 2019
Merged

zlib: add package #3455

3 commits merged into from
Apr 14, 2019

Conversation

tomty89
Copy link
Contributor

@tomty89 tomty89 commented Mar 5, 2019

No description provided.

Copy link
Member

@Neo-Oli Neo-Oli left a comment

Choose a reason for hiding this comment

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

I am unable to install both zlib-dev and ndk-sysroot at the same time.

dpkg: error processing archive ndk-sysroot_19b-1_arm.deb (--install):
 trying to overwrite '/data/data/com.termux/files/usr/include/zconf.h', which is also in package zlib-dev 1.2.11

scripts/build/termux_step_massage.sh Outdated Show resolved Hide resolved
@tomty89
Copy link
Contributor Author

tomty89 commented Mar 7, 2019

I guess the file conflict is because I didn't bump the toolchain version.

@Neo-Oli
Copy link
Member

Neo-Oli commented Mar 7, 2019

That's possible. I did build from a dirty environment.

@Grimler91
Copy link
Member

Yeah, I guess ndk-sysroot needs to be bumped and zlib-dev needs TERMUX_SUBPKG_BREAKS=ndk-sysroot (<< 19b-2) TERMUX_SUBPKG_BREAKS is apparently not defined in termux_step_massage

@tomty89
Copy link
Contributor Author

tomty89 commented Mar 7, 2019

@Neo-Oli Updated.

@Neo-Oli
Copy link
Member

Neo-Oli commented Mar 7, 2019

@tomty89 Your force-pushing makes it annoying to pull from your branches, by the way.

@Neo-Oli
Copy link
Member

Neo-Oli commented Mar 7, 2019

Do we also need to add zlib to a lot of packages dependencies now? Anything linking against it would break if it isn't installed.

@tomty89
Copy link
Contributor Author

tomty89 commented Mar 7, 2019

@Neo-Oli lol, sorry, I prioritize the quality of master over convenience, heh

Well I think it can/should be listed here eventually:
https://github.com/termux/termux-packages/pull/3450/files#diff-4c790edb1eecb42a5b87bf8b7294d71bR67
But we can also only make problematic packages dep on it.

Anything linking against it would break if it isn't installed.

For that maybe we can make apt depend on it? AFAIR that's sort of the general approach in Termux.

@ghost
Copy link

ghost commented Apr 14, 2019

Added zlib to dependencies where needed, so merging now.

@ghost ghost merged commit cb93af0 into termux:master Apr 14, 2019
@tomty89
Copy link
Contributor Author

tomty89 commented Apr 14, 2019

@xeffyr Thanks a lot!

@ghost ghost mentioned this pull request Apr 14, 2019
@tomty89 tomty89 deleted the zlib branch April 26, 2019 02:56
This pull request was closed.
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