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

pkg-config: prefix sysroot path #1135

Merged
merged 2 commits into from
Jan 13, 2017
Merged

pkg-config: prefix sysroot path #1135

merged 2 commits into from
Jan 13, 2017

Conversation

Kwiboo
Copy link
Member

@Kwiboo Kwiboo commented Jan 4, 2017

This PR makes cmake set sysroot prefixed <package>_INCLUDE_DIRS and other variables when a package is found by pkg-config.

This adds a patch to pkg-config that changes the following behaviors:

  • System include and library paths is included in output for target pkg-config, PKG_CONFIG_ALLOW_SYSTEM_(CFLAGS|LIBS)
  • No longer adds a second sysroot prefix when .pc-file already contains a sysroot prefixed path
  • Sysroot path is prefixed for static library files
  • Sysroot path is prefixed for includedir and libdir variables, they are usually added to cmake <package>_(INCLUDE_DIRS|LIBRARIES)

Needs more build and runtime testing for non-cmake packages.

@MilhouseVH
Copy link
Contributor

MilhouseVH commented Jan 5, 2017

I've clean built RPi/RPi2/Generic with this on LE master + Kodi master, and all seems well - no build failures, no missing or extra files, systems boot OK etc.

Edit: All of the builds included all PVR and inputstream addons.

@lrusak
Copy link
Member

lrusak commented Jan 5, 2017

Jenkins is happy, I think we can shove this in

@MilhouseVH
Copy link
Contributor

No issues from me, but this is currently labelled LE9.

@CvH
Copy link
Member

CvH commented Jan 5, 2017

@MilhouseVH feel free to change :)

@MilhouseVH MilhouseVH removed the LE 9.0 label Jan 5, 2017
@MilhouseVH
Copy link
Contributor

MilhouseVH commented Jan 5, 2017

Removed LE9 label.

Copy link
Contributor

@MilhouseVH MilhouseVH left a comment

Choose a reason for hiding this comment

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

RPi/RPi2/Generic all seem fine.

@MilhouseVH
Copy link
Contributor

Added my approval based on my testing, but will leave the button pushing to chewitt as this will affect the beta. If chewitt doesn't want this for LE8 then we can add back the LE9 label.

@chewitt chewitt merged commit 91fbe6b into LibreELEC:master Jan 13, 2017
@Kwiboo Kwiboo deleted the pkg-config branch January 13, 2017 17:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants