[packages/rpm] - rel 51; fix -Werror=trampolines option
arekm
arekm at pld-linux.org
Sat Mar 9 01:49:40 CET 2019
commit 6507ff6c2929510c211276aa5b9cd1450aa9bb11
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sat Mar 9 01:49:25 2019 +0100
- rel 51; fix -Werror=trampolines option
macros.pld.in | 4 ++--
rpm.spec | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index e67300d..d43a351 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -47,7 +47,7 @@ Summary(ru.UTF-8): Менеджер пакетов от RPM
Summary(uk.UTF-8): Менеджер пакетів від RPM
Name: rpm
Version: 5.4.15
-Release: 50
+Release: 51
License: LGPL v2.1
Group: Base
# http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.15-0.20140824.src.rpm
diff --git a/macros.pld.in b/macros.pld.in
index 81a08b2..4e1f81b 100644
--- a/macros.pld.in
+++ b/macros.pld.in
@@ -179,8 +179,8 @@ pakietu oraz przy odpluskwianiu samego pakietu.\
# cf http://wiki.mandriva.com/en/Development/Packaging/Problems#format_not_a_string_literal_and_no_format_arguments
%Werror_cflags -Wformat -Werror=format-security
-# Use -Werror=trampoline to prevent GCC from generating code that require executable stack
-%_ssp_cflags -fstack-protector-strong --param=ssp-buffer-size=4 -Werror=trampoline
+# Use -Werror=trampolines to prevent GCC from generating code that require executable stack
+%_ssp_cflags -fstack-protector-strong --param=ssp-buffer-size=4 -Werror=trampolines
%__common_cflags -O2 -fwrapv -pipe %{Werror_cflags} %{debuginfocflags} %{?_fortify_cflags} %{!?nospecflags:%{?specflags}}
%__common_cflags_with_ssp %{__common_cflags} %{?_ssp_cflags}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/6507ff6c2929510c211276aa5b9cd1450aa9bb11
More information about the pld-cvs-commit
mailing list