Merge lp:~vanvugt/unity-system-compositor/fix-1355609 into lp:unity-system-compositor

[Daniel van Vugt]

When building static library "usc.a" make sure you use
MIRSERVER_STATIC_LDFLAGS or else the Requires.private information from
mirserver.pc won't be used, leading to linkage failure (LP: #1355609)

"... libraries from Requires.private will only be included when static linking."
[http://people.freedesktop.org/~dbn/pkg-config-guide.html]

So the introduction of Requires.private was correct, but is only used in STATIC downstream targets, and even then only if you remember to use the MIRSERVER_STATIC_* variables.

[lp:~vanvugt/unity-system-compositor/fix-1355609]

165. By Daniel van Vugt on 2014-08-12

Document!

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:164
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/142/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-utopic-amd64-ci/38
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-utopic-armhf-ci/38

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-system-compositor-ci/142/rebuild

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

Is this an alternative incantation for "bzr diff -c 155 lp:~mir-team/unity-system-compositor/devel-mir-next"?

review: Needs Information

[Daniel van Vugt (vanvugt)]

No, revision 155 is not an alternative solution. The necessary references to mirclient only exist in MIRSERVER_STATIC variables. Have a look at <usc-builddir>/CMakeCache.txt, or at my comments in bug 1355609.

[Daniel van Vugt (vanvugt)]

BTW, if you do find mention of mirclient in MIRSERVER_L* then you've configured your usc build incorrectly and are using an _old_ version of mirserver.pc somehow. I suspect this is why our build silos keep working when clearly they should be failing.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:165
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/144/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-utopic-amd64-ci/40
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-utopic-armhf-ci/40

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-system-compositor-ci/144/rebuild

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

Nope, am using the right mirserver.pc - don't understand the different results but don't object to the change.

review: Approve

[Cemil Azizoglu (cemil-azizoglu)]

Looks good. Let me know if you need help landing this.

review: Approve

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-07-09 06:58:05 +0000
+++ src/CMakeLists.txt	2014-08-12 06:22:18 +0000
@@ -61,7 +61,7 @@
 link_directories(${MIRSERVER_LIBRARY_DIRS})
 
 target_link_libraries(usc
-  ${MIRSERVER_LDFLAGS}
+  ${MIRSERVER_STATIC_LDFLAGS}  # Meaning usc is STATIC, _not_ libmirserver.
   pthread
   ${Boost_LIBRARIES}
   ${GLESv2_LIBRARIES}