From 02bbcd37c3cae422ddbc0f60cf710f35dc8a373e Mon Sep 17 00:00:00 2001 From: Lucía Andrea Illanes Albornoz Date: Apr 02 2023 05:28:39 +0000 Subject: Ensure LC_ALL is set during builds because ccache sucks. --- diff --git a/env.d/050.paths.env b/env.d/050.paths.env deleted file mode 100644 index a5cf807..0000000 --- a/env.d/050.paths.env +++ /dev/null @@ -1,65 +0,0 @@ -# -# Copyright (c) 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Lucía Andrea Illanes Albornoz -# -# WARNING: Do _NOT_ use whitespaces (` ') or tab (` ') -# characters in any of the variables below save for MAKEFLAGS, -# PATH, and TIMESTAMP_FMT. -# -# ${PREFIX_{CROSS,MINGW32,MINIPIX,NATIVE,RPM}} and ${BUILD_WORKDIR} -# must be immediately beneath ${PREFIX}. ${PREFIX} must be o+rwx. -# The variables mentioned should not be forward slash-terminated. -# - -# -# Path & variable names and URLs -: ${PREFIX_ROOT:="${HOME}/midipix"}; -: ${PREFIX:="${PREFIX_ROOT}/${ARCH}/${BUILD_KIND}"}; -: ${PREFIX_CROSS:="${PREFIX}/${DEFAULT_TARGET}"}; -: ${PREFIX_MINGW32:="${PREFIX}/x86_64-w64-mingw32"}; -: ${PREFIX_MINIPIX:="${PREFIX}/minipix"}; -: ${PREFIX_NATIVE:="${PREFIX}/native"}; -: ${PREFIX_RPM:="${PREFIX}/rpm"}; -: ${BUILD_DLCACHEDIR:="${PREFIX_ROOT}/dlcache"}; -: ${BUILD_WORKDIR:="${PREFIX}/tmp"}; -: ${DEFAULT_CHECK_PATH_VARS:="PREFIX PREFIX_NATIVE PREFIX_CROSS BUILD_DLCACHEDIR BUILD_WORKDIR"}; -: ${DEFAULT_CLEAR_ENV_VARS_EXCEPT:=" \ - HOME PATH TERM USER \ - ARCH BUILD_KIND \ - BUILD_DLCACHEDIR BUILD_HNAME BUILD_WORKDIR \ - PREFIX PREFIX_CROSS PREFIX_MINGW32 PREFIX_MINIPIX PREFIX_NATIVE PREFIX_ROOT PREFIX_RPM"}; -: ${DEFAULT_CLEAR_PREFIX_PATHS:=" - bin i686-nt32-midipix doc include info lib lib64 libexec man minipix minipix_dist native - rpm sbin share tmp usr x86_64-nt64-midipix x86_64-w64-mingw32 pkglist.cross pkglist.host - pkglist.native SHA256SUMS SHA256SUMS.last"}; -: ${DEFAULT_INSTALL_FILES_DESTDIR:=" \ - /=bin /=include /=lib /=lib/pkgconfig /=sbin \ - /=share /=share/doc /=share/info /=share/man \ - /=share/man/man1 /=share/man/man2 /=share/man/man3 /=share/man/man4 /=share/man/man5 \ - /=share/man/man6 /=share/man/man7 /=share/man/man8 /=share/man/man9 \ - @share/doc=doc \ - @share/info=info \ - @lib=lib64 \ - @share/man=man \ - @../lib/pkgconfig=share/pkgconfig \ - @.=usr"}; -: ${DEFAULT_LOG_ENV_VARS:=" \ - ARCH BUILD_KIND BUILD_DLCACHEDIR BUILD_WORKDIR DEFAULT_GITROOT \ - HOME PATH PREFIX PREFIX_CROSS PREFIX_MINGW32 PREFIX_MINIPIX \ - PREFIX_NATIVE PREFIX_RPM USER"}; -: ${DEFAULT_MIRRORS:=" \ -https://midipix.org/mirror/ \ -https://midipix.luciaillanes.de/archives/ \ -"}; -: ${DEFAULT_MIRRORS_GIT:=" \ -https://midipix.luciaillanes.de/repos_git/ \ -"}; - -# -# Build {log,status} & tarball names -: ${DEFAULT_BUILD_LAST_FAILED_PKG_FNAME:=${BUILD_WORKDIR}/last_failed_pkg}; -: ${DEFAULT_BUILD_LOG_FNAME:=${PREFIX}/build.log}; -: ${DEFAULT_BUILD_LOG_LAST_FNAME:=${PREFIX}/build.log.last}; -: ${DEFAULT_BUILD_STATUS_IN_PROGRESS_FNAME:=${PREFIX}/BUILD_IN_PROGRESS}; -: ${DEFAULT_ZIPDIST_FNAME_PREFIX:=midipix-${ARCH}-${BUILD_KIND}.}; - -# vim:filetype=sh textwidth=0 diff --git a/env.d/050.pathsvars.env b/env.d/050.pathsvars.env new file mode 100644 index 0000000..d4f7ca6 --- /dev/null +++ b/env.d/050.pathsvars.env @@ -0,0 +1,71 @@ +# +# Copyright (c) 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Lucía Andrea Illanes Albornoz +# +# WARNING: Do _NOT_ use whitespaces (` ') or tab (` ') +# characters in any of the variables below save for MAKEFLAGS, +# PATH, and TIMESTAMP_FMT. +# +# ${PREFIX_{CROSS,MINGW32,MINIPIX,NATIVE,RPM}} and ${BUILD_WORKDIR} +# must be immediately beneath ${PREFIX}. ${PREFIX} must be o+rwx. +# The variables mentioned should not be forward slash-terminated. +# + +# +# Path names +: ${PREFIX_ROOT:="${HOME}/midipix"}; +: ${PREFIX:="${PREFIX_ROOT}/${ARCH}/${BUILD_KIND}"}; +: ${PREFIX_CROSS:="${PREFIX}/${DEFAULT_TARGET}"}; +: ${PREFIX_MINGW32:="${PREFIX}/x86_64-w64-mingw32"}; +: ${PREFIX_MINIPIX:="${PREFIX}/minipix"}; +: ${PREFIX_NATIVE:="${PREFIX}/native"}; +: ${PREFIX_RPM:="${PREFIX}/rpm"}; +: ${BUILD_DLCACHEDIR:="${PREFIX_ROOT}/dlcache"}; +: ${BUILD_WORKDIR:="${PREFIX}/tmp"}; +: ${DEFAULT_INSTALL_FILES_DESTDIR:=" \ + /=bin /=include /=lib /=lib/pkgconfig /=sbin \ + /=share /=share/doc /=share/info /=share/man \ + /=share/man/man1 /=share/man/man2 /=share/man/man3 /=share/man/man4 /=share/man/man5 \ + /=share/man/man6 /=share/man/man7 /=share/man/man8 /=share/man/man9 \ + @share/doc=doc \ + @share/info=info \ + @lib=lib64 \ + @share/man=man \ + @../lib/pkgconfig=share/pkgconfig \ + @.=usr"}; + +# +# Build {log,status} & tarball names +: ${DEFAULT_BUILD_LAST_FAILED_PKG_FNAME:=${BUILD_WORKDIR}/last_failed_pkg}; +: ${DEFAULT_BUILD_LOG_FNAME:=${PREFIX}/build.log}; +: ${DEFAULT_BUILD_LOG_LAST_FNAME:=${PREFIX}/build.log.last}; +: ${DEFAULT_BUILD_STATUS_IN_PROGRESS_FNAME:=${PREFIX}/BUILD_IN_PROGRESS}; +: ${DEFAULT_ZIPDIST_FNAME_PREFIX:=midipix-${ARCH}-${BUILD_KIND}.}; + +# +# Variable names +: ${DEFAULT_CHECK_PATH_VARS:="PREFIX PREFIX_NATIVE PREFIX_CROSS BUILD_DLCACHEDIR BUILD_WORKDIR"}; +: ${DEFAULT_CLEAR_ENV_VARS_EXCEPT:=" \ + HOME LC_ALL PATH TERM USER \ + ARCH BUILD_KIND \ + BUILD_DLCACHEDIR BUILD_HNAME BUILD_WORKDIR \ + PREFIX PREFIX_CROSS PREFIX_MINGW32 PREFIX_MINIPIX PREFIX_NATIVE PREFIX_ROOT PREFIX_RPM"}; +: ${DEFAULT_CLEAR_PREFIX_PATHS:=" + bin i686-nt32-midipix doc include info lib lib64 libexec man minipix minipix_dist native + rpm sbin share tmp usr x86_64-nt64-midipix x86_64-w64-mingw32 pkglist.cross pkglist.host + pkglist.native SHA256SUMS SHA256SUMS.last"}; +: ${DEFAULT_LOG_ENV_VARS:=" \ + ARCH BUILD_KIND BUILD_DLCACHEDIR BUILD_WORKDIR DEFAULT_GITROOT \ + HOME PATH PREFIX PREFIX_CROSS PREFIX_MINGW32 PREFIX_MINIPIX \ + PREFIX_NATIVE PREFIX_RPM USER"}; + +# +# URLs +: ${DEFAULT_MIRRORS:=" \ +https://midipix.org/mirror/ \ +https://midipix.luciaillanes.de/archives/ \ +"}; +: ${DEFAULT_MIRRORS_GIT:=" \ +https://midipix.luciaillanes.de/repos_git/ \ +"}; + +# vim:filetype=sh textwidth=0 diff --git a/subr.ex/ex_init.subr b/subr.ex/ex_init.subr index 62b0130..1214146 100644 --- a/subr.ex/ex_init.subr +++ b/subr.ex/ex_init.subr @@ -275,6 +275,7 @@ ex_init_files() { elif ! rtl_check_path_vars "${_eif_rstatus}" "${_eif_check_path_vars}"; then _eif_rc=1; else + export LC_ALL="${LC_ALL:-C}"; export TMP="${_eif_workdir}" TMPDIR="${_eif_workdir}"; touch "${_eif_build_status_in_progress_fname}";