blob: 5f14665b8d4eea32f41dc166deacd4cdf238acb8 [file] [log] [blame]
Andrew Geisslerf103a7f2021-05-07 16:09:40 -05001From 7f8acd59bb2e54f9be25a98dd71534700a9e355a Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Mon, 19 Apr 2021 23:14:28 -0700
4Subject: [PATCH] tigervnc: add fPIC option to COMPILE_FLAGS
Brad Bishopd7bf8c12018-02-25 22:55:05 -05005
Andrew Geisslerf103a7f2021-05-07 16:09:40 -05006The static libraries in network/rdr/rfb were linked by shared
Brad Bishopd7bf8c12018-02-25 22:55:05 -05007library libvnc.so, so we should add fPIC option to COMPILE_FLAGS to fix
8relocation issue.
9
10Upstream-Status: Pending
11
12Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Andrew Geisslerf103a7f2021-05-07 16:09:40 -050013Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Brad Bishopd7bf8c12018-02-25 22:55:05 -050014---
Brad Bishopd7bf8c12018-02-25 22:55:05 -050015 common/network/CMakeLists.txt | 1 +
16 common/rdr/CMakeLists.txt | 1 +
17 common/rfb/CMakeLists.txt | 1 +
Andrew Geisslerf103a7f2021-05-07 16:09:40 -050018 3 files changed, 3 insertions(+)
Brad Bishopd7bf8c12018-02-25 22:55:05 -050019
Brad Bishopd7bf8c12018-02-25 22:55:05 -050020diff --git a/common/network/CMakeLists.txt b/common/network/CMakeLists.txt
Andrew Geisslerf103a7f2021-05-07 16:09:40 -050021index d00ca452..e84e0290 100644
Brad Bishopd7bf8c12018-02-25 22:55:05 -050022--- a/common/network/CMakeLists.txt
23+++ b/common/network/CMakeLists.txt
Andrew Geisslerf103a7f2021-05-07 16:09:40 -050024@@ -16,4 +16,5 @@ endif()
Brad Bishopd7bf8c12018-02-25 22:55:05 -050025
26 if(UNIX)
27 libtool_create_control_file(network)
28+ set_target_properties(network PROPERTIES COMPILE_FLAGS -fPIC)
29 endif()
30diff --git a/common/rdr/CMakeLists.txt b/common/rdr/CMakeLists.txt
Andrew Geisslerf103a7f2021-05-07 16:09:40 -050031index 989ba2f4..20f6489d 100644
Brad Bishopd7bf8c12018-02-25 22:55:05 -050032--- 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()
40diff --git a/common/rfb/CMakeLists.txt b/common/rfb/CMakeLists.txt
Andrew Geisslerf103a7f2021-05-07 16:09:40 -050041index fc5a37bf..7f5ce131 100644
Brad Bishopd7bf8c12018-02-25 22:55:05 -050042--- a/common/rfb/CMakeLists.txt
43+++ b/common/rfb/CMakeLists.txt
Andrew Geisslerf103a7f2021-05-07 16:09:40 -050044@@ -99,4 +99,5 @@ target_link_libraries(rfb ${RFB_LIBRARIES})
Brad Bishopd7bf8c12018-02-25 22:55:05 -050045
46 if(UNIX)
47 libtool_create_control_file(rfb)
48+ set_target_properties(rfb PROPERTIES COMPILE_FLAGS -fPIC)
49 endif()
50--
Andrew Geisslerf103a7f2021-05-07 16:09:40 -0500512.30.2
Brad Bishopd7bf8c12018-02-25 22:55:05 -050052