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

Fix pkg-config packaging on Linux #442

Merged
merged 1 commit into from Apr 1, 2019

Conversation

Projects
None yet
4 participants
@ilammy
Copy link
Contributor

commented Mar 31, 2019

Add *_pkgconfig targets to dependencies of deb and rpm targets, so that *.pc files are actually generated before they are packaged. Currently these are included only into all target which is not used during packaging. (However, it is used for install target.) Now the *.pc files will be included when only make deb or make rpm is run.

Also, move the *.pc files into libthemis-dev and libthemis-devel packages, out from the libthemis package which should contain only (shared) libraries.

Fix pkg-config packaging on Linux
Add "*_pkgconfig" targets to dependencies of "deb" and "rpm" targets,
so that *.pc files are actually generated before they are packaged.
Currently these are included only into "all" target which is not used
during packaging. (However, it is used for "install" target.) Now the
*.pc files will be included when only "make deb" or "make rpm" is run.

Also, move the *.pc files into "libthemis-dev" and "libthemis-devel"
packages, out from the "libthemis" package which should contain only
(shared) libraries.
@vixentael
Copy link
Member

left a comment

LTGM, but @shadinua and @Lagovas have final votes

@ilammy

This comment has been minimized.

Copy link
Contributor Author

commented Apr 1, 2019

Also available as ilammy/pkg-config branch in the main fork.

@Lagovas

Lagovas approved these changes Apr 1, 2019

Copy link
Contributor

left a comment

lgtm

@ilammy

This comment has been minimized.

Copy link
Contributor Author

commented Apr 1, 2019

Android builds on CircleCI have some transient issues with simulator version. Let's ignore it for now. Linux packages are not tested by CircleCI anyway...

@ilammy ilammy merged commit d345e8f into cossacklabs:master Apr 1, 2019

7 of 8 checks passed

ci/circleci: android Your tests failed on CircleCI
Details
ci/bitrise/b32b4ea8bffedad7/push Passed - themis
Details
ci/circleci: analyze Your tests passed on CircleCI!
Details
ci/circleci: integration_tests Your tests passed on CircleCI!
Details
ci/circleci: php5 Your tests passed on CircleCI!
Details
ci/circleci: php70 Your tests passed on CircleCI!
Details
ci/circleci: php71 Your tests passed on CircleCI!
Details
ci/circleci: x86_64 Your tests passed on CircleCI!
Details

@ilammy ilammy deleted the ilammy:pkg-config branch Apr 1, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.