mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-11-28 22:12:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(config): Remove make.conf options that duplicate profile defaults.

Browse Source 
We were already using the default for CFLAGS, etc. LDFLAGS had
--as-needed but that has gone into the default Gentoo profile so we
ought to move it there as well. Also, ld's -O1 and -O2 are equivalent so
use the profile default -O1.
This commit is contained in:
Michael Marineau 2013-07-03 15:20:16 -04:00
parent 3428565cf1
commit 7018c2d527
4 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-host vendored
View File

@ -1,9 +1,5 @@
# See "man make.conf" for the available options. # See "man make.conf" for the available options.
ACCEPT_KEYWORDS="amd64"
CHOST="x86_64-pc-linux-gnu"
CFLAGS="-O2 -pipe"
LDFLAGS="-Wl,-O2 -Wl,--as-needed"
FEATURES="allow-missing-manifests buildpkg clean-logs -collision-protect FEATURES="allow-missing-manifests buildpkg clean-logs -collision-protect
-ebuild-locks parallel-install sandbox -strict userfetch userpriv -ebuild-locks parallel-install sandbox -strict userfetch userpriv
usersandbox -unknown-features-warn" usersandbox -unknown-features-warn"

2
sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-target vendored
View File

@ -5,8 +5,6 @@
# Pull in definition of at least { ROOT, CHOST, [BOARD_OVERLAY] } # Pull in definition of at least { ROOT, CHOST, [BOARD_OVERLAY] }
source make.conf.board_setup source make.conf.board_setup
ACCEPT_KEYWORDS="amd64"
# Common settings across all board targets. # Common settings across all board targets.
source make.conf.common source make.conf.common

5
sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.common-target vendored
View File

@ -10,10 +10,6 @@
CBUILD=x86_64-pc-linux-gnu CBUILD=x86_64-pc-linux-gnu
HOSTCC=x86_64-pc-linux-gnu-gcc HOSTCC=x86_64-pc-linux-gnu-gcc
LDFLAGS="-Wl,-O2 -Wl,--as-needed"
ACCEPT_KEYWORDS="${ARCH}"
# Be sure we don't overwrite pkgs from another sysroot. # Be sure we don't overwrite pkgs from another sysroot.
PKGDIR=${ROOT}packages/ PKGDIR=${ROOT}packages/
PORTAGE_TMPDIR=${ROOT}tmp/ PORTAGE_TMPDIR=${ROOT}tmp/
@ -27,7 +23,6 @@ FEATURES="allow-missing-manifests buildpkg clean-logs -collision-protect
PORTAGE_WORKDIR_MODE="0755" PORTAGE_WORKDIR_MODE="0755"
PKG_CONFIG_PATH="${ROOT}usr/lib/pkgconfig/:${ROOT}usr/share/pkgconfig/" PKG_CONFIG_PATH="${ROOT}usr/lib/pkgconfig/:${ROOT}usr/share/pkgconfig/"
ELIBC="glibc"
PORTDIR="/usr/local/portage/stable" PORTDIR="/usr/local/portage/stable"

2
sdk_container/src/third_party/coreos-overlay/profiles/default/linux/make.defaults vendored
View File

@ -42,7 +42,7 @@ VIDEO_CARDS="dummy fbdev v4l"
# after discussion on the gentoo-dev ML. As we bang out a clear # after discussion on the gentoo-dev ML. As we bang out a clear
# direction with how LDFLAGS will be set by default, this entry # direction with how LDFLAGS will be set by default, this entry
# may move. # may move.
LDFLAGS="-Wl,-O1" LDFLAGS="-Wl,-O1 -Wl,--as-needed"
# 2009/09/21 Robin H. Johnson <robbat2@gentoo.org> # 2009/09/21 Robin H. Johnson <robbat2@gentoo.org>
# http://archives.gentoo.org/gentoo-dev/msg_dc705dc2c1a45e18a85aa62e8fb17009.xml # http://archives.gentoo.org/gentoo-dev/msg_dc705dc2c1a45e18a85aa62e8fb17009.xml