From e1a2008624cd12dbbb468dc18d6ef2ae06da9b70 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 7 Feb 2015 11:38:59 +0100 Subject: [PATCH] linuxX.X: no need to disable -fstack-protector-strong with musl. --- srcpkgs/linux3.14/template | 8 -------- srcpkgs/linux3.16/template | 8 -------- srcpkgs/linux3.17/template | 8 -------- srcpkgs/linux3.18/template | 8 -------- 4 files changed, 32 deletions(-) diff --git a/srcpkgs/linux3.14/template b/srcpkgs/linux3.14/template index b9ea3921c2..48180e9536 100644 --- a/srcpkgs/linux3.14/template +++ b/srcpkgs/linux3.14/template @@ -55,14 +55,6 @@ do_configure() { fi # Always use our revision to CONFIG_LOCALVERSION to match our pkg version. sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config - - # XXX disable -fstack-protector-strong with musl; remove this if gcc>=4.9 - # is supported with musl. - case "$XBPS_TARGET_MACHINE" in - *-musl) - sed -i -e 's|\(CONFIG_CC_STACKPROTECTOR_STRONG\).*|# \1 is not set|' .config - ;; - esac } do_build() { make ${makejobs} prepare diff --git a/srcpkgs/linux3.16/template b/srcpkgs/linux3.16/template index aae653e94c..3dc8278ee2 100644 --- a/srcpkgs/linux3.16/template +++ b/srcpkgs/linux3.16/template @@ -55,14 +55,6 @@ do_configure() { fi # Always use our revision to CONFIG_LOCALVERSION to match our pkg version. sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config - - # XXX disable -fstack-protector-strong with musl; remove this if gcc>=4.9 - # is supported with musl. - case "$XBPS_TARGET_MACHINE" in - *-musl) - sed -i -e 's|\(CONFIG_CC_STACKPROTECTOR_STRONG\).*|# \1 is not set|' .config - ;; - esac } do_build() { # Override EXTRAVERSION because we can't have dashes in kernel name diff --git a/srcpkgs/linux3.17/template b/srcpkgs/linux3.17/template index 9d7954f269..26e7894ab6 100644 --- a/srcpkgs/linux3.17/template +++ b/srcpkgs/linux3.17/template @@ -55,14 +55,6 @@ do_configure() { fi # Always use our revision to CONFIG_LOCALVERSION to match our pkg version. sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config - - # XXX disable -fstack-protector-strong with musl; remove this if gcc>=4.9 - # is supported with musl. - case "$XBPS_TARGET_MACHINE" in - *-musl) - sed -i -e 's|\(CONFIG_CC_STACKPROTECTOR_STRONG\).*|# \1 is not set|' .config - ;; - esac } do_build() { # Override EXTRAVERSION because we can't have dashes in kernel name diff --git a/srcpkgs/linux3.18/template b/srcpkgs/linux3.18/template index 7960ed5993..cc30bdecd6 100644 --- a/srcpkgs/linux3.18/template +++ b/srcpkgs/linux3.18/template @@ -57,14 +57,6 @@ do_configure() { fi # Always use our revision to CONFIG_LOCALVERSION to match our pkg version. sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config - - # XXX disable -fstack-protector-strong with musl; remove this if gcc>=4.9 - # is supported with musl. - case "$XBPS_TARGET_MACHINE" in - *-musl) - sed -i -e 's|\(CONFIG_CC_STACKPROTECTOR_STRONG\).*|# \1 is not set|' .config - ;; - esac } do_build() { # Override EXTRAVERSION because we can't have dashes in kernel name