diff options
| author | Brian P. Hinz <bphinz@users.sf.net> | 2016-02-29 22:56:27 -0500 |
|---|---|---|
| committer | Brian P. Hinz <bphinz@users.sf.net> | 2016-02-29 22:58:16 -0500 |
| commit | 846aed7d8b6100fcdc2ae89e78cacf53be6d975a (patch) | |
| tree | 37c397f01ecad73ad349c2b05df6c50258848ed6 | |
| parent | 6daedeb412c72eb2cb92f321b9d38604acbcc6b0 (diff) | |
| download | tigervnc-846aed7d8b6100fcdc2ae89e78cacf53be6d975a.tar.gz tigervnc-846aed7d8b6100fcdc2ae89e78cacf53be6d975a.zip | |
More fixes for libX11 linkage problems
| -rw-r--r-- | contrib/packages/rpm/el5/SOURCES/tigervnc14-static-build-fixes.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/packages/rpm/el5/SOURCES/tigervnc14-static-build-fixes.patch b/contrib/packages/rpm/el5/SOURCES/tigervnc14-static-build-fixes.patch index 686f2f7e..dd26ea66 100644 --- a/contrib/packages/rpm/el5/SOURCES/tigervnc14-static-build-fixes.patch +++ b/contrib/packages/rpm/el5/SOURCES/tigervnc14-static-build-fixes.patch @@ -9,7 +9,7 @@ endif() - set(FLTK_LIBRARIES "${FLTK_LIBRARIES} -lX11") -+ set(FLTK_LIBRARIES "${FLTK_LIBRARIES} -Wl,-Bstatic -lX11 -lxcb -lXdmcp -lXau -lICE -Wl,-Bdynamic -ldl") ++ set(FLTK_LIBRARIES "${FLTK_LIBRARIES} -Wl,-Bdynamic -lX11 -Wl,-Bstatic -lxcb -lXdmcp -lXau -lICE -Wl,-Bdynamic -ldl") endif() endif() @@ -18,7 +18,7 @@ # even it has had an ABI change once or twice. if(X11_FOUND AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "SunOS") - set(X11_LIBRARIES "-Wl,-Bstatic -lXext -Wl,-Bdynamic -lX11") -+ set(X11_LIBRARIES "-Wl,-Bstatic -lXext -lX11 -lxcb -lXdmcp -lXau -lICE -Wl,-Bdynamic -ldl -lpthread") ++ set(X11_LIBRARIES "-Wl,-Bstatic -lXext -Wl,-Bdynamic -lX11 -Wl,-Bstatic -lxcb -lXdmcp -lXau -lICE -Wl,-Bdynamic -ldl -lpthread") if(X11_XTest_LIB) set(X11_XTest_LIB "-Wl,-Bstatic -lXtst -Wl,-Bdynamic") endif() |