Compiz Core

Merge lp:~vanvugt/compiz-core/fix-919920 into lp:compiz-core/0.9.5

  1. fix-919920
  2. Merge into 0.9.5
Proposed by Daniel van Vugt
Status: Merged
Merged at revision: 2931
Proposed branch: lp:~vanvugt/compiz-core/fix-919920
Merge into: lp:compiz-core/0.9.5
Diff against target: 85 lines (+2/-7)
7 files modified
cmake/CompizCommon.cmake (+2/-1)
plugins/place/src/constrain-to-workarea/CMakeLists.txt (+0/-1)
plugins/place/src/screen-size-change/CMakeLists.txt (+0/-1)
src/window/constrainment/CMakeLists.txt (+0/-1)
src/window/extents/CMakeLists.txt (+0/-1)
src/window/geometry-saver/CMakeLists.txt (+0/-1)
src/window/geometry/CMakeLists.txt (+0/-1)
To merge this branch: bzr merge lp:~vanvugt/compiz-core/fix-919920
Reviewer Review Type Date Requested Status
Compiz Maintainers Pending
Review via email: mp+89582@code.launchpad.net

Description of the change

Fix build (link) failure due to static libraries inside a shared library not being built with -fPIC. (LP: #919920)

Since almost all of compiz is now shared libraries it's simpler to apply -fPIC to everthing.

To post a comment you must log in.

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-01-19 18:12:31 +0000
3+++ cmake/CompizCommon.cmake 2012-01-22 09:49:25 +0000
4@@ -42,7 +42,8 @@
5 COMPIZ_I18N_DIR ${COMPIZ_I18N_DIR} CACHE PATH "Translation file directory"
6 )
7
8-set (COMMON_FLAGS "-Wall")
9+# Almost everything is a shared library now, so almost everything needs -fPIC
10+set (COMMON_FLAGS "-fPIC -Wall")
11
12 option (COMPIZ_DEPRECATED_WARNINGS "Warn about declarations marked deprecated" OFF)
13 if (NOT COMPIZ_DEPRECATED_WARNINGS)
14
15=== modified file 'plugins/place/src/constrain-to-workarea/CMakeLists.txt'
16--- plugins/place/src/constrain-to-workarea/CMakeLists.txt 2012-01-20 06:13:07 +0000
17+++ plugins/place/src/constrain-to-workarea/CMakeLists.txt 2012-01-22 09:49:25 +0000
18@@ -51,7 +51,6 @@
19 SET_TARGET_PROPERTIES(
20 compiz_place_constrain_to_workarea PROPERTIES
21 PUBLIC_HEADER "${PUBLIC_HEADERS}"
22- COMPILE_FLAGS "-fPIC"
23 )
24
25 INSTALL(
26
27=== modified file 'plugins/place/src/screen-size-change/CMakeLists.txt'
28--- plugins/place/src/screen-size-change/CMakeLists.txt 2012-01-20 06:27:10 +0000
29+++ plugins/place/src/screen-size-change/CMakeLists.txt 2012-01-22 09:49:25 +0000
30@@ -51,7 +51,6 @@
31 SET_TARGET_PROPERTIES(
32 compiz_place_screen_size_change PROPERTIES
33 PUBLIC_HEADER "${PUBLIC_HEADERS}"
34- COMPILE_FLAGS "-fPIC"
35 )
36
37 INSTALL(
38
39=== modified file 'src/window/constrainment/CMakeLists.txt'
40--- src/window/constrainment/CMakeLists.txt 2012-01-19 20:27:55 +0000
41+++ src/window/constrainment/CMakeLists.txt 2012-01-22 09:49:25 +0000
42@@ -49,7 +49,6 @@
43 SET_TARGET_PROPERTIES(
44 compiz_window_constrainment PROPERTIES
45 PUBLIC_HEADER "${PUBLIC_HEADERS}"
46- COMPILE_FLAGS "-fPIC"
47 )
48
49 INSTALL(
50
51=== modified file 'src/window/extents/CMakeLists.txt'
52--- src/window/extents/CMakeLists.txt 2012-01-19 20:18:20 +0000
53+++ src/window/extents/CMakeLists.txt 2012-01-22 09:49:25 +0000
54@@ -47,7 +47,6 @@
55 SET_TARGET_PROPERTIES(
56 compiz_window_extents PROPERTIES
57 PUBLIC_HEADER "${PUBLIC_HEADERS}"
58- COMPILE_FLAGS "-fPIC"
59 )
60
61 INSTALL(
62
63=== modified file 'src/window/geometry-saver/CMakeLists.txt'
64--- src/window/geometry-saver/CMakeLists.txt 2012-01-19 20:00:04 +0000
65+++ src/window/geometry-saver/CMakeLists.txt 2012-01-22 09:49:25 +0000
66@@ -49,7 +49,6 @@
67 SET_TARGET_PROPERTIES(
68 compiz_window_geometry_saver PROPERTIES
69 PUBLIC_HEADER "${PUBLIC_HEADERS}"
70- COMPILE_FLAGS "-fPIC"
71 )
72
73 INSTALL(
74
75=== modified file 'src/window/geometry/CMakeLists.txt'
76--- src/window/geometry/CMakeLists.txt 2012-01-19 20:08:32 +0000
77+++ src/window/geometry/CMakeLists.txt 2012-01-22 09:49:25 +0000
78@@ -47,7 +47,6 @@
79 SET_TARGET_PROPERTIES(
80 compiz_window_geometry PROPERTIES
81 PUBLIC_HEADER "${PUBLIC_HEADERS}"
82- COMPILE_FLAGS "-fPIC"
83 )
84
85 INSTALL(

Subscribers

People subscribed via source and target branches