From: Karel Zak <kzak@redhat.com>
Date: Tue, 11 Sep 2012 08:06:23 +0000 (+0200)
Subject: build-sys: remove static from config-gen.d/{devel,all}.conf
X-Git-Tag: v2.23-rc1~702
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=af2e97b56bb7d26160b219723459b2087e0e8dd9;p=thirdparty%2Futil-linux.git

build-sys: remove static from config-gen.d/{devel,all}.conf

It's impossible to compile static when gcc/ld is forced to
use GNU_RELRO and BIND_NOW for suid binaries (e.g. mount).

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/tools/config-gen.d/all.conf b/tools/config-gen.d/all.conf
index 7a52334795..163d2b15a9 100644
--- a/tools/config-gen.d/all.conf
+++ b/tools/config-gen.d/all.conf
@@ -1,5 +1,4 @@
 include:core.conf
-include:static.conf
 
 --enable-most-builds
 --enable-login-stat-mail
diff --git a/tools/config-gen.d/devel.conf b/tools/config-gen.d/devel.conf
index 6da22513f5..9298ccc99e 100644
--- a/tools/config-gen.d/devel.conf
+++ b/tools/config-gen.d/devel.conf
@@ -1,7 +1,6 @@
 include:all.conf
 include:audit.conf
 include:selinux.conf
-include:static.conf
 
 --enable-gtk-doc
 --with-utempter