Compiz

Merge lp:~vanvugt/compiz/fix-1043143 into lp:compiz/0.9.8

  1. fix-1043143
  2. Merge into 0.9.8
Proposed by Daniel van Vugt
Status: Merged
Approved by: Daniel van Vugt
Approved revision: 3328
Merged at revision: 3329
Proposed branch: lp:~vanvugt/compiz/fix-1043143
Merge into: lp:compiz/0.9.8
Diff against target: 62 lines (+6/-6)
5 files modified
cmake/CompizCommon.cmake (+1/-1)
compizconfig/libcompizconfig/src/CMakeLists.txt (+1/-1)
plugins/compiztoolbox/CMakeLists.txt (+1/-1)
plugins/imgsvg/CMakeLists.txt (+1/-1)
plugins/opengl/CMakeLists.txt (+2/-2)
To merge this branch: bzr merge lp:~vanvugt/compiz/fix-1043143
Reviewer Review Type Date Requested Status
Sam Spilsbury Approve
Review via email: mp+121774@code.launchpad.net

Commit message

Treat unresolved symbols at link time as an error, rather than letting them
through and cause strange crashes later. (LP: #1043143)

Description of the change

Treat unresolved symbols at link time as an error, rather than letting them
through and cause strange crashes later. (LP: #1043143)

To post a comment you must log in.
Revision history for this message
Sam Spilsbury (smspillaz) wrote :

This makes sense - I trust that we are linking plugins to compiz_core

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cmake/CompizCommon.cmake'
2--- cmake/CompizCommon.cmake 2012-08-22 01:21:08 +0000
3+++ cmake/CompizCommon.cmake 2012-08-29 08:53:20 +0000
4@@ -40,7 +40,7 @@
5 )
6
7 # Almost everything is a shared library now, so almost everything needs -fPIC
8-set (COMMON_FLAGS "-fPIC -Wall")
9+set (COMMON_FLAGS "-fPIC -Wall -Wl,-zdefs")
10
11 option (COMPIZ_DEPRECATED_WARNINGS "Warn about declarations marked deprecated" OFF)
12 if (NOT COMPIZ_DEPRECATED_WARNINGS)
13
14=== modified file 'compizconfig/libcompizconfig/src/CMakeLists.txt'
15--- compizconfig/libcompizconfig/src/CMakeLists.txt 2012-07-26 23:11:25 +0000
16+++ compizconfig/libcompizconfig/src/CMakeLists.txt 2012-08-29 08:53:20 +0000
17@@ -65,7 +65,7 @@
18 )
19
20 target_link_libraries (
21- compizconfig ${LIBCOMPIZCONFIG_LIBRARIES} m
22+ compizconfig ${LIBCOMPIZCONFIG_LIBRARIES} m dl
23 )
24
25 #
26
27=== modified file 'plugins/compiztoolbox/CMakeLists.txt'
28--- plugins/compiztoolbox/CMakeLists.txt 2010-05-15 04:54:32 +0000
29+++ plugins/compiztoolbox/CMakeLists.txt 2012-08-29 08:53:20 +0000
30@@ -2,4 +2,4 @@
31
32 include (CompizPlugin)
33
34-compiz_plugin (compiztoolbox PLUGINDEPS composite opengl)
35+compiz_plugin (compiztoolbox PLUGINDEPS composite opengl LIBRARIES Xrender)
36
37=== modified file 'plugins/imgsvg/CMakeLists.txt'
38--- plugins/imgsvg/CMakeLists.txt 2012-08-22 05:05:13 +0000
39+++ plugins/imgsvg/CMakeLists.txt 2012-08-29 08:53:20 +0000
40@@ -13,4 +13,4 @@
41
42 include_directories (${CMAKE_CURRENT_BINARY_DIR}/src)
43
44-compiz_plugin(imgsvg PLUGINDEPS composite opengl PKGDEPS cairo>=1.0 cairo-xlib librsvg-2.0>=2.14.0)
45+compiz_plugin(imgsvg PLUGINDEPS composite opengl PKGDEPS cairo>=1.0 cairo-xlib librsvg-2.0>=2.14.0 LIBRARIES decoration)
46
47=== modified file 'plugins/opengl/CMakeLists.txt'
48--- plugins/opengl/CMakeLists.txt 2012-07-05 08:17:49 +0000
49+++ plugins/opengl/CMakeLists.txt 2012-08-29 08:53:20 +0000
50@@ -8,11 +8,11 @@
51 add_subdirectory (src/doublebuffer)
52
53 if (USE_GLES)
54- compiz_plugin(opengl PLUGINDEPS composite CFLAGSADD "-DUSE_GLES -std=c++0x" LIBRARIES ${OPENGLES2_LIBRARIES} ${INTERNAL_LIBRARIES} INCDIRS ${OPENGLES2_INCLUDE_DIR})
55+ compiz_plugin(opengl PLUGINDEPS composite CFLAGSADD "-DUSE_GLES -std=c++0x" LIBRARIES ${OPENGLES2_LIBRARIES} ${INTERNAL_LIBRARIES} dl INCDIRS ${OPENGLES2_INCLUDE_DIR})
56 else (USE_GLES)
57 find_package (OpenGL)
58 if (OPENGL_FOUND)
59- compiz_plugin(opengl PLUGINDEPS composite CFLAGSADD -std=c++0x LIBRARIES ${OPENGL_gl_LIBRARY} ${INTERNAL_LIBRARIES} INCDIRS ${OPENGL_INCLUDE_DIR})
60+ compiz_plugin(opengl PLUGINDEPS composite CFLAGSADD -std=c++0x LIBRARIES ${OPENGL_gl_LIBRARY} ${INTERNAL_LIBRARIES} dl INCDIRS ${OPENGL_INCLUDE_DIR})
61 endif (OPENGL_FOUND)
62 endif (USE_GLES)
63

Subscribers

People subscribed via source and target branches