diff options
| author |   Anthony G. Basile <blueness@gentoo.org> | 2014-06-09 15:19:09 +0000 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2014-06-09 15:19:09 +0000 |
| commit | 592c8f0c9b05933a2d285c92170ef52abc98ead7 (patch) | |
| tree | f156159e791a9377455ea8f4a83d272d88175f9f /profiles/hardened | |
| parent | Remove old. (diff) | |
| download | gentoo-2-592c8f0c9b05933a2d285c92170ef52abc98ead7.tar.gz gentoo-2-592c8f0c9b05933a2d285c92170ef52abc98ead7.tar.bz2 gentoo-2-592c8f0c9b05933a2d285c92170ef52abc98ead7.zip | |
Remove redundant INSTALL_MASK in amd64 and x86
Diffstat (limited to 'profiles/hardened')
| -rw-r--r-- | profiles/hardened/ChangeLog | 7 | ||||
| -rw-r--r-- | profiles/hardened/linux/musl/amd64/make.defaults | 6 | ||||
| -rw-r--r-- | profiles/hardened/linux/musl/make.defaults | 5 | ||||
| -rw-r--r-- | profiles/hardened/linux/musl/x86/make.defaults | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/profiles/hardened/ChangeLog b/profiles/hardened/ChangeLog index e1e9a848d381..4461250a4dd1 100644 --- a/profiles/hardened/ChangeLog +++ b/profiles/hardened/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for Gentoo/AMD64 profile directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/ChangeLog,v 1.50 2014/06/08 16:11:37 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/ChangeLog,v 1.51 2014/06/09 15:19:08 blueness Exp $ + + 09 Jun 2014; Anthony G. Basile <blueness@gentoo.org> + linux/musl/amd64/make.defaults, linux/musl/make.defaults, + linux/musl/x86/make.defaults: + Remove redundant INSTALL_MASK in amd64 and x86 08 Jun 2014; Anthony G. Basile <blueness@gentoo.org> linux/musl/make.defaults: diff --git a/profiles/hardened/linux/musl/amd64/make.defaults b/profiles/hardened/linux/musl/amd64/make.defaults index 896835fd08ef..0dbf3e648a0c 100644 --- a/profiles/hardened/linux/musl/amd64/make.defaults +++ b/profiles/hardened/linux/musl/amd64/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/amd64/make.defaults,v 1.4 2014/02/17 15:14:14 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/amd64/make.defaults,v 1.5 2014/06/09 15:19:09 blueness Exp $ ARCH="amd64" ACCEPT_KEYWORDS="${ARCH}" @@ -10,7 +10,3 @@ CFLAGS="-O2 -pipe" CXXFLAGS="${CFLAGS}" FFLAGS="${CFLAGS}" FCFLAGS="${CFLAGS}" - -# TODO: fix so musl doesn't generate this for all packages -# that use a charset, it causes package collisons. -INSTALL_MASK="charset.alias" diff --git a/profiles/hardened/linux/musl/make.defaults b/profiles/hardened/linux/musl/make.defaults index 32657ba023e3..aaf4cbb1d887 100644 --- a/profiles/hardened/linux/musl/make.defaults +++ b/profiles/hardened/linux/musl/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/make.defaults,v 1.4 2014/06/08 16:11:37 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/make.defaults,v 1.5 2014/06/09 15:19:08 blueness Exp $ ELIBC="musl" @@ -10,4 +10,7 @@ USE="hardened nptl pax_kernel pic unicode xattr -berkdb -jit -orc" BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened nptl pax_kernel pic -berkdb -jit -orc" SYMLINK_LIB="no" + +# TODO: fix so musl doesn't generate this for all packages +# that use a charset, it causes package collisons. INSTALL_MASK="charset.alias" diff --git a/profiles/hardened/linux/musl/x86/make.defaults b/profiles/hardened/linux/musl/x86/make.defaults index ef0e1c0db685..88c786f8ecbb 100644 --- a/profiles/hardened/linux/musl/x86/make.defaults +++ b/profiles/hardened/linux/musl/x86/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/x86/make.defaults,v 1.4 2014/02/17 15:14:14 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/x86/make.defaults,v 1.5 2014/06/09 15:19:09 blueness Exp $ ARCH="x86" ACCEPT_KEYWORDS="${ARCH}" @@ -10,7 +10,3 @@ CFLAGS="-O2 -pipe" CXXFLAGS="${CFLAGS}" FFLAGS="${CFLAGS}" FCFLAGS="${CFLAGS}" - -# TODO: fix so musl doesn't generate this for all packages -# that use a charset, it causes package collisons. -INSTALL_MASK="charset.alias" |