From dba7b63eba6be97decf942c385dd00301e29717e Mon Sep 17 00:00:00 2001 From: Silvino Silva Date: Tue, 12 May 2020 21:29:03 +0100 Subject: pkgmk.conf.harden update --- core/conf/pkgmk.conf.harden | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) (limited to 'core') diff --git a/core/conf/pkgmk.conf.harden b/core/conf/pkgmk.conf.harden index f2ab5a6..3bf88b1 100644 --- a/core/conf/pkgmk.conf.harden +++ b/core/conf/pkgmk.conf.harden @@ -20,7 +20,29 @@ PIC_CFLAGS="${W_FLAGS} ${H_CFLAGS} -fPIC" PIC_CXXFLAGS="${PIC_CFLAGS} -D_FORTIFY_SOURCE=2" PIC_LDFLAGS="-fPIC -Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now" -export MAKEFLAGS="-j$(nproc)" +# local compile only +export JOBS=$(nproc) +export MAKEFLAGS="-j $JOBS" + +# ccache settings +export PATH="/usr/lib/ccache/:$PATH" +export CCACHE_DIR="/usr/ports/ccache" +export CCACHE_COMPILERCHECK="%compiler% -dumpversion; crux" + +# compile using ccache and distcc +export CCACHE_PREFIX="distcc" +#export DISTCC_HOSTS="localhost/4 xborg/4 c11/2" +export DISTCC_HOSTS="ports/4 localhost/2" + +## compile using distcc without ccache +#export PATH="/usr/lib/distcc/:$PATH" +#export PUMP_BUILD=yes + +# distcc settings +export JOBS=$(/usr/bin/distcc -j 2> /dev/null) +export DISTCC_DIR="/usr/ports/distcc" +export MAKEFLAGS="-j ${JOBS}" +export SCONSFLAGS="$MAKEFLAGS" case ${name} in @@ -78,10 +100,10 @@ esac #PKGMK_SOURCE_MIRRORS=(https://crux.nu/distfiles/) #PKGMK_SOURCE_MIRRORS=(https://crux.ster.zone/distfiles/) -PKGMK_SOURCE_MIRRORS=(https://machine.example.org/ports/distfiles/) -PKGMK_SOURCE_DIR="/srv/ports/distfiles" -PKGMK_PACKAGE_DIR="/srv/ports/packages" -PKGMK_WORK_DIR="/srv/ports/work/$name" +PKGMK_SOURCE_MIRRORS=(http://tribu.semdestino.org/mirror/distfiles/ http://tribu.semdestino.org/mirror/archive/distfiles/) +PKGMK_SOURCE_DIR="/usr/ports/distfiles" +PKGMK_PACKAGE_DIR="/usr/ports/packages" +PKGMK_WORK_DIR="/usr/ports/work/$name" # PKGMK_DOWNLOAD="no" # PKGMK_IGNORE_FOOTPRINT="no" # PKGMK_IGNORE_NEW="no" @@ -90,5 +112,6 @@ PKGMK_WORK_DIR="/srv/ports/work/$name" # PKGMK_WGET_OPTS="" # PKGMK_CURL_OPTS="" # PKGMK_COMPRESSION_MODE="gz" +#PKGMK_UP_TO_DATE=yes # End of file -- cgit 1.4.1-2-gfad0