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 automake program name transformations #9190

Merged
merged 1 commit into from Aug 22, 2019
Merged

Fix automake program name transformations #9190

merged 1 commit into from Aug 22, 2019

Conversation

ghost
Copy link

@ghost ghost commented Aug 20, 2019

Motivation and Context

Automake can perform program name transformations at install time. However, arc_summary has its own name transformation taking place, which interferes with the automake transforms. The automake transforms must be taken into account in order to resolve the conflict.

Description

The program name transform is a sed script available to make. The name of the arc_summary program must be transformed using this script in order to successfully rename it from arc_summary2 or arc_summary3 to arc_summary when program name transforms have been used.

How Has This Been Tested?

I have been building and testing ZFS on FreeBSD (and on Linux) with this change for a few months.
Try it at home with ./configure --program-suffix=foobar and a standard make && sudo make install DESTDIR=/tmp/suffixed

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Performance enhancement (non-breaking change which improves efficiency)
  • Code cleanup (non-breaking change which makes code smaller or more readable)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentation (a change to man pages or other documentation)

Checklist:

Automake can perform program name transformations at install time.
However, arc_summary has its own name transformation taking place,
which interferes with the automake transforms. The automake transforms
must be taken into account in order to resolve the conflict.

Signed-off-by: Ryan Moeller <[email protected]>
Copy link
Contributor

@behlendorf behlendorf left a comment

Choose a reason for hiding this comment

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

Neat, I wasn't aware of this functionality. Is --program-transform-name needed by ZoF, or did you just happen to notice this functionality was missing?

@ghost
Copy link
Author

ghost commented Aug 21, 2019

We were at some point looking for ways to have ZoF and the in-tree ZFS utils coexist during testing/development, and one of the ideas was to add a suffix to the ZoF versions of the binaries. With a little research I found the program name transformation functionality, and this is where the build broke when I tried it out.

@behlendorf behlendorf added the Status: Code Review Needed Ready for review and testing label Aug 21, 2019
@behlendorf
Copy link
Contributor

@mattmacy would you mind providing a second review for this.

Copy link
Contributor

@mattmacy mattmacy left a comment

Choose a reason for hiding this comment

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

LGTM

@behlendorf behlendorf added Status: Accepted Ready to integrate (reviewed, tested) and removed Status: Code Review Needed Ready for review and testing labels Aug 22, 2019
@behlendorf behlendorf merged commit a3ba6e5 into openzfs:master Aug 22, 2019
@ghost ghost deleted the program-name-transforms branch August 22, 2019 16:57
Copy link
Member

@gmelikov gmelikov left a comment

Choose a reason for hiding this comment

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

LGTM

Oops, didn't update the page :(

@codecov
Copy link

codecov bot commented Aug 23, 2019

Codecov Report

Merging #9190 into master will increase coverage by 0.05%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #9190      +/-   ##
==========================================
+ Coverage   79.11%   79.17%   +0.05%     
==========================================
  Files         400      400              
  Lines      122000   122000              
==========================================
+ Hits        96524    96593      +69     
+ Misses      25476    25407      -69
Flag Coverage Δ
#kernel 79.73% <ø> (ø) ⬆️
#user 67.13% <ø> (+0.15%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 325d288...92a9e1d. Read the comment docs.

@openzfs openzfs deleted a comment from codecov bot Aug 23, 2019
@openzfs openzfs deleted a comment from codecov bot Aug 23, 2019
@openzfs openzfs deleted a comment from codecov bot Aug 23, 2019
@openzfs openzfs deleted a comment from codecov bot Aug 23, 2019
@openzfs openzfs deleted a comment from codecov bot Aug 23, 2019
@openzfs openzfs deleted a comment from codecov bot Aug 23, 2019
@openzfs openzfs deleted a comment from codecov bot Aug 23, 2019
@openzfs openzfs deleted a comment from codecov bot Aug 23, 2019
@openzfs openzfs deleted a comment from codecov bot Aug 23, 2019
@openzfs openzfs deleted a comment from codecov bot Aug 23, 2019
@openzfs openzfs deleted a comment from codecov bot Aug 23, 2019
@openzfs openzfs deleted a comment from codecov bot Aug 23, 2019
@openzfs openzfs deleted a comment from codecov bot Aug 23, 2019
@openzfs openzfs deleted a comment from codecov bot Aug 23, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Status: Accepted Ready to integrate (reviewed, tested)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants