diff options
| -rw-r--r-- | env.d/050.pathsvars.env (renamed from env.d/050.paths.env) | 48 | ||||
| -rw-r--r-- | subr.ex/ex_init.subr | 1 |
2 files changed, 28 insertions, 21 deletions
diff --git a/env.d/050.paths.env b/env.d/050.pathsvars.env index a5cf8074..d4f7ca6b 100644 --- a/env.d/050.paths.env +++ b/env.d/050.pathsvars.env @@ -11,7 +11,7 @@ # # -# Path & variable names and URLs +# Path names : ${PREFIX_ROOT:="${HOME}/midipix"}; : ${PREFIX:="${PREFIX_ROOT}/${ARCH}/${BUILD_KIND}"}; : ${PREFIX_CROSS:="${PREFIX}/${DEFAULT_TARGET}"}; @@ -21,9 +21,31 @@ : ${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 PATH TERM USER \ + 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"}; @@ -31,21 +53,13 @@ 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"}; + +# +# URLs : ${DEFAULT_MIRRORS:=" \ https://midipix.org/mirror/ \ https://midipix.luciaillanes.de/archives/ \ @@ -54,12 +68,4 @@ https://midipix.luciaillanes.de/archives/ \ 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/subr.ex/ex_init.subr b/subr.ex/ex_init.subr index 62b01305..12141469 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}"; |