Andrew Geissler | f103a7f | 2021-05-07 16:09:40 -0500 | [diff] [blame] | 1 | From 7f8acd59bb2e54f9be25a98dd71534700a9e355a Mon Sep 17 00:00:00 2001 |
| 2 | From: Chen Qi <Qi.Chen@windriver.com> |
| 3 | Date: Mon, 19 Apr 2021 23:14:28 -0700 |
| 4 | Subject: [PATCH] tigervnc: add fPIC option to COMPILE_FLAGS |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 5 | |
Andrew Geissler | f103a7f | 2021-05-07 16:09:40 -0500 | [diff] [blame] | 6 | The static libraries in network/rdr/rfb were linked by shared |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 7 | library libvnc.so, so we should add fPIC option to COMPILE_FLAGS to fix |
| 8 | relocation issue. |
| 9 | |
| 10 | Upstream-Status: Pending |
| 11 | |
| 12 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
Andrew Geissler | f103a7f | 2021-05-07 16:09:40 -0500 | [diff] [blame] | 13 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 14 | --- |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 15 | common/network/CMakeLists.txt | 1 + |
| 16 | common/rdr/CMakeLists.txt | 1 + |
| 17 | common/rfb/CMakeLists.txt | 1 + |
Andrew Geissler | f103a7f | 2021-05-07 16:09:40 -0500 | [diff] [blame] | 18 | 3 files changed, 3 insertions(+) |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 19 | |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 20 | diff --git a/common/network/CMakeLists.txt b/common/network/CMakeLists.txt |
Andrew Geissler | f103a7f | 2021-05-07 16:09:40 -0500 | [diff] [blame] | 21 | index d00ca452..e84e0290 100644 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 22 | --- a/common/network/CMakeLists.txt |
| 23 | +++ b/common/network/CMakeLists.txt |
Andrew Geissler | f103a7f | 2021-05-07 16:09:40 -0500 | [diff] [blame] | 24 | @@ -16,4 +16,5 @@ endif() |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 25 | |
| 26 | if(UNIX) |
| 27 | libtool_create_control_file(network) |
| 28 | + set_target_properties(network PROPERTIES COMPILE_FLAGS -fPIC) |
| 29 | endif() |
| 30 | diff --git a/common/rdr/CMakeLists.txt b/common/rdr/CMakeLists.txt |
Andrew Geissler | f103a7f | 2021-05-07 16:09:40 -0500 | [diff] [blame] | 31 | index 989ba2f4..20f6489d 100644 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 32 | --- a/common/rdr/CMakeLists.txt |
| 33 | +++ b/common/rdr/CMakeLists.txt |
| 34 | @@ -27,4 +27,5 @@ target_link_libraries(rdr ${RDR_LIBRARIES}) |
| 35 | |
| 36 | if(UNIX) |
| 37 | libtool_create_control_file(rdr) |
| 38 | + set_target_properties(rdr PROPERTIES COMPILE_FLAGS -fPIC) |
| 39 | endif() |
| 40 | diff --git a/common/rfb/CMakeLists.txt b/common/rfb/CMakeLists.txt |
Andrew Geissler | f103a7f | 2021-05-07 16:09:40 -0500 | [diff] [blame] | 41 | index fc5a37bf..7f5ce131 100644 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 42 | --- a/common/rfb/CMakeLists.txt |
| 43 | +++ b/common/rfb/CMakeLists.txt |
Andrew Geissler | f103a7f | 2021-05-07 16:09:40 -0500 | [diff] [blame] | 44 | @@ -99,4 +99,5 @@ target_link_libraries(rfb ${RFB_LIBRARIES}) |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 45 | |
| 46 | if(UNIX) |
| 47 | libtool_create_control_file(rfb) |
| 48 | + set_target_properties(rfb PROPERTIES COMPILE_FLAGS -fPIC) |
| 49 | endif() |
| 50 | -- |
Andrew Geissler | f103a7f | 2021-05-07 16:09:40 -0500 | [diff] [blame] | 51 | 2.30.2 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 52 | |