diff --git a/linux54-tkg/PKGBUILD b/linux54-tkg/PKGBUILD index 5f9ddac..1be67a0 100644 --- a/linux54-tkg/PKGBUILD +++ b/linux54-tkg/PKGBUILD @@ -262,6 +262,9 @@ prepare() { sed -i -e 's/CONFIG_LZ4_COMPRESS=m/CONFIG_LZ4_COMPRESS=y/' ./.config sed -i -e 's/CONFIG_LZ4HC_COMPRESS=m/CONFIG_LZ4HC_COMPRESS=y/' ./.config sed -i -e 's/CONFIG_RCU_BOOST_DELAY=500/CONFIG_RCU_BOOST_DELAY=0/' ./.config + if [ "$_noccache" != "true" ] && pacman -Qq ccache &> /dev/null; then + sed -i -e 's/CONFIG_GCC_PLUGINS=y/# CONFIG_GCC_PLUGINS is not set/' ./.config + fi # Inject cpuopts options echo "# CONFIG_MK8SSE3 is not set" >> ./.config @@ -844,8 +847,10 @@ build() { fi # ccache - if pacman -Qq ccache &> /dev/null; then + if [ "$_noccache" != "true" ] && pacman -Qq ccache &> /dev/null; then export PATH="/usr/lib/ccache/bin/:$PATH" + export CCACHE_SLOPPINESS="file_macro,locale,time_macros" + export CCACHE_NOHASHDIR="true" msg2 'ccache was found and will be used' fi diff --git a/linux54-tkg/customization.cfg b/linux54-tkg/customization.cfg index 98562a7..c9c5733 100644 --- a/linux54-tkg/customization.cfg +++ b/linux54-tkg/customization.cfg @@ -23,6 +23,9 @@ _OPTIPROFILE="" # Set to true to bypass makepkg.conf and use all available threads for compilation. False will respect your makepkg.conf options. _force_all_threads="false" +# Set to true to prevent ccache from being used and set CONFIG_GCC_PLUGINS=y (which needs to be disabled for ccache to work properly) +_noccache="false" + # Set to true to use modprobed db to clean config from unneeded modules. Speeds up compilation considerably. Requires root - https://wiki.archlinux.org/index.php/Modprobed-db # !!!! Make sure to have a well populated db !!!! - Leave empty to be asked about it at build time _modprobeddb="false" diff --git a/linux55-tkg/PKGBUILD b/linux55-tkg/PKGBUILD index 90faeec..079593b 100644 --- a/linux55-tkg/PKGBUILD +++ b/linux55-tkg/PKGBUILD @@ -268,6 +268,9 @@ prepare() { sed -i -e 's/# CONFIG_CMDLINE_BOOL is not set/CONFIG_CMDLINE_BOOL=y/' ./.config echo "CONFIG_CMDLINE=\"${_custom_commandline}\"" >> ./.config echo "# CONFIG_CMDLINE_OVERRIDE is not set" >> ./.config + if [ "$_noccache" != "true" ] && pacman -Qq ccache &> /dev/null; then + sed -i -e 's/CONFIG_GCC_PLUGINS=y/# CONFIG_GCC_PLUGINS is not set/' ./.config + fi if [ "$_font_autoselect" != "false" ]; then sed -i -e 's/CONFIG_FONT_TER16x32=y/# CONFIG_FONT_TER16x32 is not set\nCONFIG_FONT_AUTOSELECT=y/' ./.config @@ -896,8 +899,10 @@ build() { fi # ccache - if pacman -Qq ccache &> /dev/null; then + if [ "$_noccache" != "true" ] && pacman -Qq ccache &> /dev/null; then export PATH="/usr/lib/ccache/bin/:$PATH" + export CCACHE_SLOPPINESS="file_macro,locale,time_macros" + export CCACHE_NOHASHDIR="true" msg2 'ccache was found and will be used' fi diff --git a/linux55-tkg/customization.cfg b/linux55-tkg/customization.cfg index 95b39a3..afc1d0f 100644 --- a/linux55-tkg/customization.cfg +++ b/linux55-tkg/customization.cfg @@ -23,6 +23,9 @@ _OPTIPROFILE="" # Set to true to bypass makepkg.conf and use all available threads for compilation. False will respect your makepkg.conf options. _force_all_threads="true" +# Set to true to prevent ccache from being used and set CONFIG_GCC_PLUGINS=y (which needs to be disabled for ccache to work properly) +_noccache="false" + # Set to true to use modprobed db to clean config from unneeded modules. Speeds up compilation considerably. Requires root - https://wiki.archlinux.org/index.php/Modprobed-db # !!!! Make sure to have a well populated db !!!! - Leave empty to be asked about it at build time _modprobeddb="false" diff --git a/linux56-tkg/PKGBUILD b/linux56-tkg/PKGBUILD index a081064..4a701cb 100644 --- a/linux56-tkg/PKGBUILD +++ b/linux56-tkg/PKGBUILD @@ -274,6 +274,9 @@ prepare() { sed -i -e 's/# CONFIG_CMDLINE_BOOL is not set/CONFIG_CMDLINE_BOOL=y/' ./.config echo "CONFIG_CMDLINE=\"${_custom_commandline}\"" >> ./.config echo "# CONFIG_CMDLINE_OVERRIDE is not set" >> ./.config + if [ "$_noccache" != "true" ] && pacman -Qq ccache &> /dev/null; then + sed -i -e 's/CONFIG_GCC_PLUGINS=y/# CONFIG_GCC_PLUGINS is not set/' ./.config + fi if [ "$_font_autoselect" != "false" ]; then sed -i -e 's/CONFIG_FONT_TER16x32=y/# CONFIG_FONT_TER16x32 is not set\nCONFIG_FONT_AUTOSELECT=y/' ./.config @@ -902,8 +905,10 @@ build() { fi # ccache - if pacman -Qq ccache &> /dev/null; then + if [ "$_noccache" != "true" ] && pacman -Qq ccache &> /dev/null; then export PATH="/usr/lib/ccache/bin/:$PATH" + export CCACHE_SLOPPINESS="file_macro,locale,time_macros" + export CCACHE_NOHASHDIR="true" msg2 'ccache was found and will be used' fi diff --git a/linux56-tkg/customization.cfg b/linux56-tkg/customization.cfg index 8ebef5b..daee14a 100644 --- a/linux56-tkg/customization.cfg +++ b/linux56-tkg/customization.cfg @@ -23,6 +23,9 @@ _OPTIPROFILE="" # Set to true to bypass makepkg.conf and use all available threads for compilation. False will respect your makepkg.conf options. _force_all_threads="true" +# Set to true to prevent ccache from being used and set CONFIG_GCC_PLUGINS=y (which needs to be disabled for ccache to work properly) +_noccache="false" + # Set to true to use modprobed db to clean config from unneeded modules. Speeds up compilation considerably. Requires root - https://wiki.archlinux.org/index.php/Modprobed-db # !!!! Make sure to have a well populated db !!!! - Leave empty to be asked about it at build time _modprobeddb="false"