cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace patch hunk with CFLAGS/CXXFLAGS addition

Browse Source
This commit is contained in:
kn 2022-03-02 00:40:09 +00:00
parent 3cecfb1c6a
commit 055971a1f6
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/tdesktop/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.14 2022/02/28 22:48:48 kn Exp $
# $OpenBSD: Makefile,v 1.15 2022/03/02 00:40:09 kn Exp $
# the MTProto implementation does not support big-endian
# https://github.com/telegramdesktop/tdesktop/issues/3167#issuecomment-658308298
@ -33,6 +33,10 @@ WANTLIB += xxhash z
# C++17 set below
COMPILER = base-clang ports-gcc
# cc/c++: warning: argument unused during compilation: '-fstack-clash-protection'
CFLAGS += -Wno-unused-command-line-argument
CXXFLAGS += -Wno-unused-command-line-argument
MODULES = devel/cmake \
lang/python \
x11/qt5

14
net/tdesktop/patches/patch-cmake_options__linux_cmake
View File

@ -1,22 +1,12 @@
$OpenBSD: patch-cmake_options__linux_cmake,v 1.4 2022/02/05 16:38:32 kn Exp $
$OpenBSD: patch-cmake_options__linux_cmake,v 1.5 2022/03/02 00:40:09 kn Exp $
1) remove unknown -fstack-clash-protection (produces warnings spam)
2) We prefer to use the system malloc instead of jemalloc. The problem
We prefer to use the system malloc instead of jemalloc. The problem
that is solved with it has never been reproduced with OpenBSD malloc.
more: https://github.com/telegramdesktop/tdesktop/issues/16084
Index: cmake/options_linux.cmake
--- cmake/options_linux.cmake.orig
+++ cmake/options_linux.cmake
@@ -7,7 +7,6 @@
target_compile_options(common_options
INTERFACE
-fstack-protector-all
- -fstack-clash-protection
-fPIC
$<IF:$<CONFIG:Debug>,,-fno-strict-aliasing>
-pipe
@@ -61,13 +60,6 @@ if (DESKTOP_APP_SPECIAL_TARGET)
target_compile_options(common_options INTERFACE $<IF:$<CONFIG:Debug>,,-g -flto>)
target_link_options(common_options INTERFACE $<IF:$<CONFIG:Debug>,,-g -flto -fuse-linker-plugin>)