sys-boot/lilo: remove legacy HARDENED_CFLAGS, bug #621866

Package-Manager: Portage-2.3.13, Repoman-2.3.3

diff --git a/sys-boot/lilo/lilo-22.8-r2.ebuild b/sys-boot/lilo/lilo-22.8-r2.ebuild
index 7ae95e523fe6a157cc5f620dbb6598c7b84f52b9..257a7a9a11365a0786e51fea98d216e8cb1f0713 100644 (file)
--- a/sys-boot/lilo/lilo-22.8-r2.ebuild
+++ b/sys-boot/lilo/lilo-22.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit eutils flag-o-matic toolchain-funcs
@@ -48,16 +48,12 @@ src_compile() {
        # lilo needs this. bug #140209
        export LC_ALL=C
 
-       # hardened automatic PIC plus PIE building should be suppressed
-       # because of assembler instructions that cannot be compiled PIC
-       HARDENED_CFLAGS="`test-flags-CC -fno-pic -nopie`"
-
        # we explicitly prevent the custom CFLAGS for stability reasons
        if use static; then
-               emake CC="$(tc-getCC) ${HARDENED_CFLAGS}" lilo.static || die
+               emake CC="$(tc-getCC)" lilo.static || die
                mv lilo.static lilo || die
        else
-               emake CC="$(tc-getCC) ${HARDENED_CFLAGS}" lilo || die
+               emake CC="$(tc-getCC)" lilo || die
        fi
 }
 

diff --git a/sys-boot/lilo/lilo-23.2-r2.ebuild b/sys-boot/lilo/lilo-23.2-r2.ebuild
index afbd4d2a7346f9eebcd4b9c6bde874e8f195b8ab..2be5f25cd5076a141e3bb4a838f186ab93c5a905 100644 (file)
--- a/sys-boot/lilo/lilo-23.2-r2.ebuild
+++ b/sys-boot/lilo/lilo-23.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="2"
@@ -49,10 +49,6 @@ src_compile() {
        # lilo needs this. bug #140209
        export LC_ALL=C
 
-       # hardened automatic PIC plus PIE building should be suppressed
-       # because of assembler instructions that cannot be compiled PIC
-       HARDENED_CFLAGS=$(test-flags-CC -fno-pic -nopie)
-
        # we explicitly prevent the custom CFLAGS for stability reasons
        if use static; then
                local target=alles
@@ -60,7 +56,7 @@ src_compile() {
                local target=all
        fi
 
-       emake CC="$(tc-getCC) ${LDFLAGS} ${HARDENED_CFLAGS}" ${target} || die
+       emake CC="$(tc-getCC) ${LDFLAGS}" ${target} || die
 }
 
 src_install() {

diff --git a/sys-boot/lilo/lilo-24.0-r1.ebuild b/sys-boot/lilo/lilo-24.0-r1.ebuild
index 4de878e34d339abfdc1e95a417ab7b571819095b..b0639924ba398d4cc495d42a144c79132ed4ac82 100644 (file)
--- a/sys-boot/lilo/lilo-24.0-r1.ebuild
+++ b/sys-boot/lilo/lilo-24.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -49,10 +49,6 @@ src_compile() {
        # lilo needs this. bug #140209
        export LC_ALL=C
 
-       # hardened automatic PIC plus PIE building should be suppressed
-       # because of assembler instructions that cannot be compiled PIC
-       HARDENED_CFLAGS=$(test-flags-CC -fno-pic -nopie)
-
        # we explicitly prevent the custom CFLAGS for stability reasons
        if use static; then
                local target=alles
@@ -60,7 +56,7 @@ src_compile() {
                local target=all
        fi
 
-       emake CC="$(tc-getCC) ${LDFLAGS} ${HARDENED_CFLAGS}" ${target} || die
+       emake CC="$(tc-getCC) ${LDFLAGS}" ${target} || die
 }
 
 src_install() {

diff --git a/sys-boot/lilo/lilo-24.1.ebuild b/sys-boot/lilo/lilo-24.1.ebuild
index 3d0cf52c05dad1190cfc6b4b6aa58d2f4d82f78b..9431f2659608bed35791baeb71c4937e91bbc623 100644 (file)
--- a/sys-boot/lilo/lilo-24.1.ebuild
+++ b/sys-boot/lilo/lilo-24.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -49,10 +49,6 @@ src_compile() {
        # lilo needs this. bug #140209
        export LC_ALL=C
 
-       # hardened automatic PIC plus PIE building should be suppressed
-       # because of assembler instructions that cannot be compiled PIC
-       HARDENED_CFLAGS=$(test-flags-CC -fno-pic -nopie)
-
        # we explicitly prevent the custom CFLAGS for stability reasons
        if use static; then
                local target=alles
@@ -60,7 +56,7 @@ src_compile() {
                local target=all
        fi
 
-       emake CC="$(tc-getCC) ${LDFLAGS} ${HARDENED_CFLAGS}" ${target} || die
+       emake CC="$(tc-getCC) ${LDFLAGS}" ${target} || die
 }
 
 src_install() {

diff --git a/sys-boot/lilo/lilo-24.2.ebuild b/sys-boot/lilo/lilo-24.2.ebuild
index d075d6bf75178b7e1ae9e6f8f0cb1e6d95f31d0d..854b8dba4364fc31f18de8ae761c5fdaf27e0c25 100644 (file)
--- a/sys-boot/lilo/lilo-24.2.ebuild
+++ b/sys-boot/lilo/lilo-24.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -49,10 +49,6 @@ src_compile() {
        # lilo needs this. bug #140209
        export LC_ALL=C
 
-       # hardened automatic PIC plus PIE building should be suppressed
-       # because of assembler instructions that cannot be compiled PIC
-       HARDENED_CFLAGS=$(test-flags-CC -fno-pic -nopie)
-
        # we explicitly prevent the custom CFLAGS for stability reasons
        if use static; then
                local target=alles
@@ -60,7 +56,7 @@ src_compile() {
                local target=all
        fi
 
-       emake CC="$(tc-getCC) ${LDFLAGS} ${HARDENED_CFLAGS}" ${target} || die
+       emake CC="$(tc-getCC) ${LDFLAGS}" ${target} || die
 }
 
 src_install() {