Skip to content
GitLab
  • Menu
Projects Groups Snippets
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • P pkg-config
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 62
    • Issues 62
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 14
    • Merge requests 14
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages & Registries
    • Packages & Registries
    • Container Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • pkg-config
  • pkg-config
  • Merge requests
  • !4

define-prefix: skip one level if it ends up in /lib

  • Review changes

  • Download
  • Email patches
  • Plain diff
Open Luca Boccassi requested to merge bluca/pkg-config:define_prefix_multiarch into master Jul 03, 2019
  • Overview 4
  • Commits 1
  • Changes 3

In Debian and Ubuntu the multiarch filesystem layout looks as follows:

/usr/lib/x86_64-linux-gnu/pkgconfig/ /usr/lib/i386-linux-gnu/pkgconfig/

Which means when --define-prefix skips to the grand-parent directory of pkgconfig, it ends up in /usr/lib rather than /usr as it's supposed to.

This causes for example the include path to be printed as: /usr/lib/include which is wrong and breaks applications.

Check if the new directory is 'lib' and if it is go one step above. A new series of unit tests is added with this layout.

Assignee
Assign to
Reviewer
Request review from
Time tracking
Source branch: define_prefix_multiarch