diff --git a/.bin/obsdmake b/.bin/obsdmake index 4167e1b..ec7c341 100755 --- a/.bin/obsdmake +++ b/.bin/obsdmake @@ -16,13 +16,8 @@ export CCACHE_NOHASHDIR= export CMAKE_CXX_COMPILER_LAUNCHER=ccache export CMAKE_C_COMPILER_LAUNCHER=ccache -if [ ! -z $INSECURE_PERF_FLAGS ] -then - FLAGS="-fno-stack-protector -fno-ret-protector -mno-retpoline -march=native" -fi - -export CC="/opt/ccache/bin/cc $FLAGS" -export CXX="/opt/ccache/bin/c++ $FLAGS" +export CC="/opt/ccache/bin/cc $EXTRAFLAGS" +export CXX="/opt/ccache/bin/c++ $EXTRAFLAGS" if [ -z "$1" ]; then echo "Usage: ${0} [kernel, base, xenocara, release, all] [clean]" diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..209e420 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.ksh/localstuff.ksh diff --git a/.ksh/porttools.ksh b/.ksh/porttools.ksh index f80765a..fb9fbfc 100644 --- a/.ksh/porttools.ksh +++ b/.ksh/porttools.ksh @@ -47,7 +47,6 @@ alias port-modcargo-gen-crates="_portmodcargo_gen" alias port-modcargo-gen-licenses="_portmodcargo_genlic" alias port-modgo-gen-modules="_portmodgoupdate" - # source control alias port-diff="_portgendiff" alias cvs-update="_cvsupdate" @@ -161,14 +160,15 @@ _portmodgoupdate() { make MODGO_VERSION=latest modgo-gen-modules; } _portmodcargo_gen() { make modcargo-gen-crates; } _portmodcargo_genlic() { make modcargo-gen-crates-licenses; } -_dpbmake() { +_dpbmake() {( + set -xe doas chroot /home/dpb /tmp/installdeps.sh $1 doas /usr/ports/infrastructure/bin/dpb -B /home/dpb -c -I $1 -} +)} _prootrebuild() { doas proot -c /etc/proot.conf - doas chroot /home/dpb pkg_add -Dsnap ccache + doas chroot /home/dpb pkg_add -Dsnap ccache gmake cmake meson ninja go rust { echo '#!/bin/sh -ex' echo 'cd /usr/ports/$1'