Compiz

Merge lp:~sil2100/compiz/fix_python_find_package into lp:compiz/0.9.9

  1. fix_python_find_package
  2. Merge into 0.9.9
Proposed by Łukasz Zemczak on 2012-12-11
Status: Merged
Approved by: Daniel van Vugt on 2012-12-12
Approved revision: 3523
Merged at revision: 3524
Proposed branch: lp:~sil2100/compiz/fix_python_find_package
Merge into: lp:compiz/0.9.9
Diff against target: 13 lines (+2/-1)
1 file modified
compizconfig/compizconfig-python/CMakeLists.txt (+2/-1)
To merge this branch: bzr merge lp:~sil2100/compiz/fix_python_find_package
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2012-12-12
Daniel van Vugt 2012-12-11 Approve on 2012-12-12
Review via email: mp+139256@code.launchpad.net

Commit Message

Change to pkg_check_modules instead of find_package to find python-related
includes in multi-arch.
(LP: #1088996)

Description of the Change

- Problem:

Compiz FTBFS after the latest python package upgrade. The problem seems to be in the pyconfig.h file moved to a multi-arch directory, which is not supported by find_package().

- Fix:

Use pkg_check_modules() instead find_package().

- Tests:

N/A

To post a comment you must log in.
Łukasz Zemczak (sil2100) wrote :
Didier Roche (didrocks) wrote :

It is now in, Lukasz, please restest with it :)

Daniel van Vugt (vanvugt) wrote :

It looks right, providing Jenkins agrees.

I'm not sure we need to impose 2.7 as a requirement right now but it probably won't hurt.

review: Approve
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'compizconfig/compizconfig-python/CMakeLists.txt'
2--- compizconfig/compizconfig-python/CMakeLists.txt 2012-12-04 15:22:23 +0000
3+++ compizconfig/compizconfig-python/CMakeLists.txt 2012-12-11 16:37:28 +0000
4@@ -8,7 +8,8 @@
5 execute_process (COMMAND python -c "import sys; print str (sys.version_info[0]) + '.' + str (sys.version_info[1])"
6 OUTPUT_VARIABLE PY_VERSION)
7
8-find_package (PythonLibs)
9+include (FindPkgConfig)
10+pkg_check_modules (PYTHON python-2.7)
11
12 # This is a workaround for a broken FindPythonLibs always finding the
13 # wrong library version because PYTHON_LIBRARY is in the cache and

Subscribers

People subscribed via source and target branches