Merge lp:~alan-griffiths/mir/fix-1208774 into lp:~mir-team/mir/trunk

[Alan Griffiths]

platform: workaround link errors on i386/g++ 4.8.1

platform: workaround link errors on i386/g++ 4.8.1

[Daniel van Vugt (vanvugt)]

Do we have evidence the error is spurious? The tools are usually quite accurate on this. I suspect we have made a serious linkage mistake...

review: Needs Information

[Alan Griffiths (alan-griffiths)]

> Do we have evidence the error is spurious? The tools are usually quite
> accurate on this. I suspect we have made a serious linkage mistake...

I'm sure the linker is reporting what it sees accurately, but there is no problem with either 64bit or clang builds - which I'd expect to fail the same way if we'd made a serious mistake.

I can't spot anything bad and the "missing" symbol is resolved correctly at runtime. Consequently, I don't think it worth spending more time on.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:936
http://jenkins.qa.ubuntu.com/job/mir-ci/1240/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1638
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1523
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/478
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/478/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/1240/rebuild

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

review: Abstain

[Alexandros Frantzis (afrantzis)]

OK as a workaround. Alternatively we could explicitly link with '-lc' which also resolves the problem (still a workaround, since the linker is linking with -lc anyway).

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/563/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/generic-cleanup-mbs/1327/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1672/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1557/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-autolanding/217/console

review: Needs Fixing (continuous-integration)

[Robert Ancell (robert-ancell)]

Needs merge..

[Daniel van Vugt (vanvugt)]

If '-lc' is a viable workaround then that does suggest we're mixing static libc with shared libc. That's a high-risk mistake that can easily lead to heap corruption in the least.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:937
http://jenkins.qa.ubuntu.com/job/mir-ci/1268/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1680
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1565
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/506
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/506/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/1268/rebuild

review: Approve (continuous-integration)

[Robert Ancell (robert-ancell)]

review: Approve

=== modified file 'src/platform/graphics/CMakeLists.txt'
--- src/platform/graphics/CMakeLists.txt	2013-08-08 02:34:31 +0000
+++ src/platform/graphics/CMakeLists.txt	2013-08-09 08:26:25 +0000
@@ -1,3 +1,7 @@
+# Workaround for bug 1208774 (spurious link errors on 32bit g++)
+string (REPLACE " -Wl,--no-undefined" " " CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS})
+include_directories(${GLESv2_INCLUDE_DIRS})
+
 set(
   GRAPHICS_SOURCES