From 8371c4c69ebcc2659b5a3ab87654156706f0128693f349d2c6ba905fc472c16f Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Tue, 21 Jul 2015 08:35:40 +0000 Subject: [PATCH] Accepting request 317746 from home:msmeissn:branches:Base:System - also filter out -fstack-protector-strong - also filter out -fstack-protector-strong - also filter out -fstack-protector-strong OBS-URL: https://build.opensuse.org/request/show/317746 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=407 --- glibc-testsuite.changes | 5 +++++ glibc-testsuite.spec | 2 +- glibc-utils.changes | 5 +++++ glibc-utils.spec | 2 +- glibc.changes | 5 +++++ glibc.spec | 2 +- 6 files changed, 18 insertions(+), 3 deletions(-) diff --git a/glibc-testsuite.changes b/glibc-testsuite.changes index 79672d1..a3bc6d9 100644 --- a/glibc-testsuite.changes +++ b/glibc-testsuite.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 21 07:50:22 UTC 2015 - meissner@suse.com + +- also filter out -fstack-protector-strong + ------------------------------------------------------------------- Mon Jun 22 07:22:22 UTC 2015 - schwab@suse.de diff --git a/glibc-testsuite.spec b/glibc-testsuite.spec index 45c908d..063d916 100644 --- a/glibc-testsuite.spec +++ b/glibc-testsuite.spec @@ -541,7 +541,7 @@ echo "#define GITID \"%{git_id}\"" >> version.h # Default CFLAGS and Compiler # BuildFlags="%{optflags} -U_FORTIFY_SOURCE" -BuildFlags=$(echo $BuildFlags | sed -e 's#-fstack-protector##' -e 's#-ffortify=[0-9]*##') +BuildFlags=$(echo $BuildFlags | sed -e 's#-fstack-protector[^ ]*##' -e 's#-ffortify=[0-9]*##') BuildCC="%__cc" BuildCCplus="%__cxx" add_ons=libidn diff --git a/glibc-utils.changes b/glibc-utils.changes index 79672d1..a3bc6d9 100644 --- a/glibc-utils.changes +++ b/glibc-utils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 21 07:50:22 UTC 2015 - meissner@suse.com + +- also filter out -fstack-protector-strong + ------------------------------------------------------------------- Mon Jun 22 07:22:22 UTC 2015 - schwab@suse.de diff --git a/glibc-utils.spec b/glibc-utils.spec index 96ecac7..b923b2d 100644 --- a/glibc-utils.spec +++ b/glibc-utils.spec @@ -541,7 +541,7 @@ echo "#define GITID \"%{git_id}\"" >> version.h # Default CFLAGS and Compiler # BuildFlags="%{optflags} -U_FORTIFY_SOURCE" -BuildFlags=$(echo $BuildFlags | sed -e 's#-fstack-protector##' -e 's#-ffortify=[0-9]*##') +BuildFlags=$(echo $BuildFlags | sed -e 's#-fstack-protector[^ ]*##' -e 's#-ffortify=[0-9]*##') BuildCC="%__cc" BuildCCplus="%__cxx" add_ons=libidn diff --git a/glibc.changes b/glibc.changes index 79672d1..a3bc6d9 100644 --- a/glibc.changes +++ b/glibc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 21 07:50:22 UTC 2015 - meissner@suse.com + +- also filter out -fstack-protector-strong + ------------------------------------------------------------------- Mon Jun 22 07:22:22 UTC 2015 - schwab@suse.de diff --git a/glibc.spec b/glibc.spec index b404f9a..1d4b401 100644 --- a/glibc.spec +++ b/glibc.spec @@ -541,7 +541,7 @@ echo "#define GITID \"%{git_id}\"" >> version.h # Default CFLAGS and Compiler # BuildFlags="%{optflags} -U_FORTIFY_SOURCE" -BuildFlags=$(echo $BuildFlags | sed -e 's#-fstack-protector##' -e 's#-ffortify=[0-9]*##') +BuildFlags=$(echo $BuildFlags | sed -e 's#-fstack-protector[^ ]*##' -e 's#-ffortify=[0-9]*##') BuildCC="%__cc" BuildCCplus="%__cxx" add_ons=libidn