Rework libintern #1312
Merged
Rework libintern #1312
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
problem: the cmake-provided boost finder is deprecated in favor of the one upstream in boost starting in 1.70 solution: since we support 1.66 and up, attempt to use the upstream config (use the CONFIG flag on the find_package call), and only if that fails use the one included with cmake
problem: on my OpenSUSE dev vm, the install directory is forced pretty hard to use lib64 solution: allow lib64 as a valid path for libraries, packageconfigs and modules
problem: the libintern so wasn't being versioned, causing problems on upgrades, see flux-framework#1308 solution: the real dependency should be on libfluxion-data anyway, which was closer to how we wanted it. The libintern library is now built static, linked into libfluxion-data, and provided that way. Additionally, the libfluxion-data library is installed as `libfluxion-data.so.{version without git suffix}` and linked as `libfluxion-data.so.{version major}.{version minor}` with no unsuffixed link installed.
trws
force-pushed
the
rework-libintern
branch
from
ee59d71 to
58458db
Compare
|
@grondo, I think this covers the issue, but want to run it by you before we finalize it. |
|
This is what I get when I build it: That seems OK to me? |
|
That's what I was shooting for, so we could update on patch if we want to but will multi-version on possibly breaking changes (which right now means minor versions). |
trws
added
the
merge-when-passing
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #1312 +/- ##
======================================
Coverage 75.2% 75.2%
======================================
Files 111 111
Lines 15983 15983
======================================
Hits 12032 12032
Misses 3951 3951 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
intern: fold into fluxion-data and version the so
problem: the libintern so wasn't being versioned, causing problems on
upgrades, see #1308
solution: the real dependency should be on libfluxion-data anyway, which
was closer to how we wanted it. The libintern library is now built
static, linked into libfluxion-data, and provided that way.
Additionally, the libfluxion-data library is installed as
libfluxion-data.so.{version without git suffix}and linked aslibfluxion-data.so.{version major}.{version minor}with no unsuffixedlink installed.
The other two commits here are small fixes that I ran into needing to fix warnings in the cmake build and load properly on my tumbleweed vm.
fixes #1308