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
Merged

Conversation

ilammy
Copy link
Collaborator

@ilammy ilammy 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.

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.
@ilammy ilammy added the installation Installation of Themis core and wrapper packages label Mar 31, 2019
@vixentael vixentael added the infrastructure Automated building and packaging label Mar 31, 2019
Copy link
Contributor

@vixentael vixentael left a comment

Choose a reason for hiding this comment

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

LTGM, but @shadinua and @Lagovas have final votes

@ilammy
Copy link
Collaborator Author

ilammy commented Apr 1, 2019

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

Copy link
Collaborator

@Lagovas Lagovas left a comment

Choose a reason for hiding this comment

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

lgtm

@ilammy
Copy link
Collaborator Author

ilammy 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
@ilammy ilammy deleted the pkg-config branch April 1, 2019 10:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
infrastructure Automated building and packaging installation Installation of Themis core and wrapper packages
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants