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

swig: couple of buildsystem fixes #2181

Merged
merged 2 commits into from Nov 6, 2017
Merged

swig: couple of buildsystem fixes #2181

merged 2 commits into from Nov 6, 2017

Conversation

MilhouseVH
Copy link
Contributor

@MilhouseVH MilhouseVH commented Nov 6, 2017

I noticed that libcec and kodi on Ubuntu were being built with the build host swig (3.0.8 on 16.04, 3.0.10 on 17.10) from /usr/bin, and not $TOOLCHAIN/bin/swig which is currently version 3.0.12.

The reason for this is that Ubuntu has:

neil@nm-linux:~/projects$ ls -la /usr/bin/swig*
lrwxrwxrwx 1 root root       7 Jul 16 20:06 /usr/bin/swig -> swig3.0
-rwxr-xr-x 1 root root 1765416 Jul 16 20:06 /usr/bin/swig3.0

while we only have $TOOLCHAIN/bin/swig, and find_package(SWIG) in libcec (and also kodi) is looking for and finding swig3.0 before falling back to swig, so consequently it ignores our toolchain binary and uses the build-host file.

This PR fixes this error by configuring swig to create the swig3.0 binary in our toolchain.

The swig sym link is just for backward compatibility (ie. just in case), same as Ubuntu.

Thanks @Raybuntu for looking into this.

Copy link
Contributor

@Ray-future Ray-future left a comment

Choose a reason for hiding this comment

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

Thanks

@Ray-future Ray-future merged commit d4f7d8d into LibreELEC:master Nov 6, 2017
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

2 participants