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

lib/libzfs, rpm: Install pkgconfig files in the correct directory #10628

Merged

Conversation

Conan-Kudo
Copy link
Contributor

Motivation and Context

libzfs is an architecture-specific library, thus its pkgconfig files should also be installed into the architecture-specific path for pkgconfig files so that systems that support multilib or multiarch installation will be able to work properly.

Description

  • Change the install path for pkgconfig files from %{_datarootdir}/pkgconfig to %{_libdir}/pkgconfig

How Has This Been Tested?

Did local package builds for CentOS 8, Fedora 32, Ubuntu 16.04, and Ubuntu 20.04 with success. The pkg-config tool still is able to look up the pkgconfig content installed by the libzfs2-devel package.

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:

  • My code follows the ZFS on Linux code style requirements.
  • I have updated the documentation accordingly.
  • I have read the contributing document.
  • I have added tests to cover my changes.
  • I have run the ZFS Test Suite with this change applied.
  • All commit messages are properly formatted and contain Signed-off-by.

libzfs is an architecture-specific library, thus its pkgconfig files
should also be installed into the architecture-specific path for
pkgconfig files so that systems that support multilib or multiarch
installation will be able to work properly.

Signed-off-by: Neal Gompa <ngompa@datto.com>
@Conan-Kudo
Copy link
Contributor Author

@behlendorf @tonyhutter This change mimics one that has already been done to master, so this is a zfs-0.8.x specific change.

@behlendorf behlendorf added the Status: Code Review Needed Ready for review and testing label Jul 27, 2020
@behlendorf
Copy link
Contributor

This change mimics one that has already been done to master, so this is a zfs-0.8.x specific change.

@Conan-Kudo would you mind rebasing this against the new openzfs/zfs-0.8.5-staging branch. We're going to start collecting and testing the backports for the 0.8.5 tag on this branch.

@Conan-Kudo Conan-Kudo changed the base branch from zfs-0.8-release to zfs-0.8.5-staging August 17, 2020 23:13
@Conan-Kudo
Copy link
Contributor Author

@behlendorf Done.

@tonyhutter tonyhutter merged commit ef1588a into openzfs:zfs-0.8.5-staging Aug 21, 2020
@tonyhutter
Copy link
Contributor

@Conan-Kudo thanks!

@Conan-Kudo Conan-Kudo deleted the zfs-0.8-pkgconfig-fix branch August 21, 2020 17:44
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Sep 15, 2020
…enzfs#10628)

libzfs is an architecture-specific library, thus its pkgconfig files
should also be installed into the architecture-specific path for
pkgconfig files so that systems that support multilib or multiarch
installation will be able to work properly.

Signed-off-by: Neal Gompa <ngompa@datto.com>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Sep 15, 2020
…enzfs#10628)

libzfs is an architecture-specific library, thus its pkgconfig files
should also be installed into the architecture-specific path for
pkgconfig files so that systems that support multilib or multiarch
installation will be able to work properly.

Signed-off-by: Neal Gompa <ngompa@datto.com>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Status: Code Review Needed Ready for review and testing
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants