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

build: do not version libpmi*.so, require minimum asciidoctor version #1992

Merged
merged 2 commits into from Feb 5, 2019

Conversation

@grondo
Copy link
Contributor

commented Feb 5, 2019

This small PR fixes a couple of outstanding build issues. Nothing earth shattering. The asciidoctor version check does pull in a new m4 package from the autoconf-archive for convenience -- perhaps there was a simpler way to do it..

grondo added 2 commits Feb 5, 2019
Problem: asciidoctor versions < 1.5.7 fail to properly generate
multiple manpages from the same adoc source, and so should not be
used for doc generation.

Generate a warning and clear the ADOC autoconf variable when a2x is
not found, but an older asciidoctor is found, so that manpage
generation is disabled. Issue a valid warning to the user both
at the time the asciidoctor version is checked as well as when
configure completes.

Fixes #1672
Closes #1911
It doesn't make sense to version libpmi.so and libpmi2.so since
these are libraries with ABIs defined elsewhere.

Remove the version variables for these libs in configure.ac
and set them manually back to 0:0:0.

Fixes #1957
@grondo grondo force-pushed the grondo:minor-build-fixes branch from 99664dd to 790ef5a Feb 5, 2019
@codecov-io

This comment has been minimized.

Copy link

commented Feb 5, 2019

Codecov Report

Merging #1992 into master will increase coverage by <.01%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #1992      +/-   ##
==========================================
+ Coverage   80.17%   80.18%   +<.01%     
==========================================
  Files         195      195              
  Lines       35146    35146              
==========================================
+ Hits        28179    28182       +3     
+ Misses       6967     6964       -3
Impacted Files Coverage Δ
src/modules/connector-local/local.c 74.81% <0%> (-0.15%) ⬇️
src/broker/module.c 82.74% <0%> (+0.26%) ⬆️
src/common/libflux/mrpc.c 88.93% <0%> (+1.18%) ⬆️
@garlick

This comment has been minimized.

Copy link
Member

commented Feb 5, 2019

LGTM, thanks.

By the way I mentioned I thought I had pulled in some m4 for manipulating versions before. It was just ax_split_version.m4 - no overlap AFAICS.

@garlick garlick merged commit fada14b into flux-framework:master Feb 5, 2019
2 of 3 checks passed
2 of 3 checks passed
codecov/project 80.16% (-0.02%) compared to 8f22a2a
Details
codecov/patch Coverage not affected when comparing 8f22a2a...790ef5a
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@grondo grondo deleted the grondo:minor-build-fixes branch Feb 8, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.