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

Utilize the INSTALL_PCDIR CMake option also for server pkgconfig file #1235

Closed
wants to merge 1 commit into from
Closed

Conversation

FaramosCZ
Copy link
Contributor

First step in MDEV-14340

@FaramosCZ
Copy link
Contributor Author

Submitted under MCA

@FaramosCZ
Copy link
Contributor Author

There is a long term problem that the pkgconfig file is considered as arch-dependent in Fedora, Debian and RHEL.

I think the propper fix should look simmilar to what's in the "libmariadb/cmake".
This PR is a quick enhancement that preserves the default behaviour, while fixing our issue.

@svoj svoj added this to the 10.4 milestone Mar 22, 2019
@iamlauriano
Copy link

where o i post bugs ?
thankfull

@claassistantio
Copy link

claassistantio commented Feb 3, 2020

CLA assistant check
All committers have signed the CLA.

@an3l an3l self-assigned this Feb 25, 2020
@ottok
Copy link
Contributor

ottok commented Feb 26, 2020

Thanks for your interest in MariaDB and contributing!

The commit message is quite brief. What are you trying to accomplish here? Just introduce a new variable INSTALL_PCDIR but not use it anywhere in the code base (just in your own builds)?

The fact that the file is installed in a wrong directory is a universal problem and correct handling of multi-arch files should be implemented. Adding a new build option just bloats the code in my opinion.

What do you think, should we maybe go with #597 instead?

@ottok
Copy link
Contributor

ottok commented Mar 3, 2020

I suggest this should be dismissed and #597 used to achieve the same thing instead.

@cvicentiu
Copy link
Member

Hi @FaramosCZ !

A combination of PRs #597, and #910 were used to achieve (hopefully) the result you were looking for.

The commits for these are:

f21592c (10.1) - slightly unrelated, fixing something within the packageconf file.
c5c1027 (10.2) - Moving the packageconf file within the libdir folder. With appropriate defines during cmake, one can place the file where desired.
fd2dc9c (10.3) - Merging some of debian downstream packaging into MariaDB to better support multi-arch builds.

Thank you for spending time on this and I apologize for having this take so long to correct.

@cvicentiu cvicentiu closed this Mar 9, 2020
@cvicentiu
Copy link
Member

And if you think that the solution that I proposed is not enough, let me know and I'd gladly consider extending it. Note that all these commits will reach 10.4 and newer versions.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
7 participants