Subtitlecomposer: re-enable stack protector (#6273)

This commit is contained in:
Jérôme Duval
2021-10-14 06:59:43 +02:00
committed by GitHub
parent f47813e0f4
commit c045b0432c
2 changed files with 1 additions and 31 deletions

View File

@@ -46,32 +46,3 @@ index 813fd10..c4b4e2f 100644
--
2.23.0
From 49a7a627393cb3d0008a893eb50c64e20313bbbb Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 15 Oct 2019 23:03:05 +1000
Subject: Disable stack protector
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b9dfb2e..8d16df9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,10 +7,10 @@ if(CMAKE_COMPILER_IS_GNUCC)
message(STATUS "GNU C compiler detected")
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -O0 -g")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -O0 -g")
- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wall -O2 -pipe -fstack-protector --param=ssp-buffer-size=4")
- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wall -O2 -pipe -fstack-protector --param=ssp-buffer-size=4")
- set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELEASE} -g -Wall -O2 -pipe -fstack-protector --param=ssp-buffer-size=4")
- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELEASE} -g -Wall -O2 -pipe -fstack-protector --param=ssp-buffer-size=4")
+ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wall -O2 -pipe")
+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wall -O2 -pipe")
+ set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELEASE} -g -Wall -O2 -pipe")
+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELEASE} -g -Wall -O2 -pipe")
endif()
include_directories(
--
2.23.0

View File

@@ -26,7 +26,7 @@ FEATURES:
HOMEPAGE="https://github.com/maxrd2/SubtitleComposer"
COPYRIGHT="2007-2019 Subtitle Composer project"
LICENSE="GNU GPL v2"
REVISION="2"
REVISION="3"
SOURCE_URI="https://github.com/maxrd2/SubtitleComposer/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="90dee806df0ee57f4098d417f62014b4533dbf5598d5535c9da1066536c1ed41"
SOURCE_DIR="SubtitleComposer-$portVersion"
@@ -88,7 +88,6 @@ REQUIRES="
lib:libQt5Network$secondaryArchSuffix
lib:libQt5Widgets$secondaryArchSuffix
lib:libQt5Xml$secondaryArchSuffix
lib:libssp$secondaryArchSuffix
lib:libswresample$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"