summaryrefslogtreecommitdiff
blob: 18240ce522e264357ca824c510c9d004efbd478b (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
Only link jemalloc for the Telegram binary

Some combination of factors is making the different codegen tools hang when
jemalloc is linked for those, and they're ran under portage's sandbox. Since
this is only used during build-time, and jemalloc is merely necessary to
improve runtime memory use, it's unnecessary to use it for anything else.

https://bugs.gentoo.org/802624

--- tdesktop-3.6.0-full.orig/Telegram/CMakeLists.txt
+++ tdesktop-3.6.0-full/Telegram/CMakeLists.txt
@@ -1376,6 +1376,14 @@
             desktop-app::external_kwayland
         )
     endif()
+
+    if (NOT DESKTOP_APP_DISABLE_JEMALLOC)
+        target_link_libraries(Telegram
+        INTERFACE
+            $<TARGET_OBJECTS:desktop-app::linux_jemalloc_helper>
+            $<LINK_ONLY:desktop-app::external_jemalloc>
+        )
+    endif()
 endif()
 
 if (build_macstore)
--- tdesktop-3.6.0-full.orig/cmake/options_linux.cmake
+++ tdesktop-3.6.0-full/cmake/options_linux.cmake
@@ -62,14 +62,6 @@
     target_link_options(common_options INTERFACE $<IF:$<CONFIG:Debug>,,-g -flto -fuse-linker-plugin>)
 endif()
 
-if (NOT DESKTOP_APP_DISABLE_JEMALLOC)
-	target_link_libraries(common_options
-	INTERFACE
-	    $<TARGET_OBJECTS:desktop-app::linux_jemalloc_helper>
-	    $<LINK_ONLY:desktop-app::external_jemalloc>
-	)
-endif()
-
 target_link_libraries(common_options
 INTERFACE
     ${CMAKE_DL_LIBS}