saving uncommitted changes in /etc prior to emerge run

This commit is contained in:
hasufell 2015-09-24 16:14:24 +02:00 committed by Hans Wurst
parent 8800d2430c
commit a39d15f5bc
4 changed files with 5 additions and 6 deletions

View File

@ -2,9 +2,7 @@
## global settings ## global settings
CC="clang" CC="clang"
BUILD_CC="clang"
CXX="clang++" CXX="clang++"
BUILD_CXX="clang++"
CFLAGS="-march=core-avx2 -O2 -pipe -Wall -Qunused-arguments -fcolor-diagnostics" CFLAGS="-march=core-avx2 -O2 -pipe -Wall -Qunused-arguments -fcolor-diagnostics"
CXXFLAGS="${CFLAGS}" CXXFLAGS="${CFLAGS}"
LDFLAGS="-Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu" LDFLAGS="-Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu"
@ -52,3 +50,6 @@ then
fi fi
[[ -e /etc/paludis/hooks/setup_pkg_env.bash ]] && . /etc/paludis/hooks/setup_pkg_env.bash [[ -e /etc/paludis/hooks/setup_pkg_env.bash ]] && . /etc/paludis/hooks/setup_pkg_env.bash
BUILD_CC=${CC}
BUILD_CXX=${CXX}

View File

@ -1,7 +1,5 @@
CC=x86_64-pc-linux-gnu-gcc CC=x86_64-pc-linux-gnu-gcc
CXX=x86_64-pc-linux-gnu-g++ CXX=x86_64-pc-linux-gnu-g++
BUILD_CC=${CC}
BUILD_CXX=${CXX}
remove-options CFLAGS -Qunused-arguments -fcolor-diagnostics remove-options CFLAGS -Qunused-arguments -fcolor-diagnostics
remove-options CXXFLAGS -Qunused-arguments -fcolor-diagnostics remove-options CXXFLAGS -Qunused-arguments -fcolor-diagnostics

View File

@ -35,7 +35,7 @@ setenv CG_INC_PATH '/opt/nvidia-cg-toolkit/include'
setenv CG_LIB_PATH '/opt/nvidia-cg-toolkit/lib32:/opt/nvidia-cg-toolkit/lib64' setenv CG_LIB_PATH '/opt/nvidia-cg-toolkit/lib32:/opt/nvidia-cg-toolkit/lib64'
setenv HG '/usr/bin/hg' setenv HG '/usr/bin/hg'
setenv CAVE_RESUME_FILE_OPT '--resume-file ~/cave_resume' setenv CAVE_RESUME_FILE_OPT '--resume-file ~/cave_resume'
setenv CAVE_SEARCH_INDEX '/var/tmp/paludis/x11-drivers-nvidia-drivers-355.11/temp//cave-search-index' setenv CAVE_SEARCH_INDEX '/root/cave-search-index'
setenv PRELINK_PATH_MASK '/usr/lib64/libfreebl3.so:/usr/lib64/libnssdbm3.so:/usr/lib64/libsoftokn3.so:/usr/lib32/libfreebl3.so:/usr/lib32/libnssdbm3.so:/usr/lib32/libsoftokn3.so' setenv PRELINK_PATH_MASK '/usr/lib64/libfreebl3.so:/usr/lib64/libnssdbm3.so:/usr/lib64/libsoftokn3.so:/usr/lib32/libfreebl3.so:/usr/lib32/libnssdbm3.so:/usr/lib32/libsoftokn3.so'
setenv VBOX_APP_HOME '/usr/lib64/virtualbox' setenv VBOX_APP_HOME '/usr/lib64/virtualbox'
setenv XDG_CONFIG_DIRS '/etc/xdg' setenv XDG_CONFIG_DIRS '/etc/xdg'

View File

@ -35,7 +35,7 @@ export CG_INC_PATH='/opt/nvidia-cg-toolkit/include'
export CG_LIB_PATH='/opt/nvidia-cg-toolkit/lib32:/opt/nvidia-cg-toolkit/lib64' export CG_LIB_PATH='/opt/nvidia-cg-toolkit/lib32:/opt/nvidia-cg-toolkit/lib64'
export HG='/usr/bin/hg' export HG='/usr/bin/hg'
export CAVE_RESUME_FILE_OPT='--resume-file ~/cave_resume' export CAVE_RESUME_FILE_OPT='--resume-file ~/cave_resume'
export CAVE_SEARCH_INDEX='/var/tmp/paludis/x11-drivers-nvidia-drivers-355.11/temp//cave-search-index' export CAVE_SEARCH_INDEX='/root/cave-search-index'
export PRELINK_PATH_MASK='/usr/lib64/libfreebl3.so:/usr/lib64/libnssdbm3.so:/usr/lib64/libsoftokn3.so:/usr/lib32/libfreebl3.so:/usr/lib32/libnssdbm3.so:/usr/lib32/libsoftokn3.so' export PRELINK_PATH_MASK='/usr/lib64/libfreebl3.so:/usr/lib64/libnssdbm3.so:/usr/lib64/libsoftokn3.so:/usr/lib32/libfreebl3.so:/usr/lib32/libnssdbm3.so:/usr/lib32/libsoftokn3.so'
export VBOX_APP_HOME='/usr/lib64/virtualbox' export VBOX_APP_HOME='/usr/lib64/virtualbox'
export XDG_CONFIG_DIRS='/etc/xdg' export XDG_CONFIG_DIRS='/etc/xdg'