From 370e98db644d9cd75172205e4e472978e68e0990 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= Date: Fri, 7 May 2021 17:12:29 +0100 Subject: Implements extended -r syntax. build.sh:buildp_ast(): only reset package build step state if ${ARG_RESET_PKG} is 1. etc/{build.usage,README.md}: updated. etc/build.usage.short, subr/build_init.subr: implement short help screen. midipix.env: correctly escape multi-line variable assignment expressions. subr.rtl/rtl_list.subr: updated. subr.rtl/rtl_state.subr:rtl_state_set(): correctly implement invalidation. subr.rtl/rtl_state.subr:rtl_state_test(): honour `LAST'. subr/build_init.subr:buildp_init_getopts(): implements --reset-pkg. subr/build_init.subr:buildp_{expand_restart_{at,recursive},process_restart_spec}(): initial implementation. subr/ex_pkg_{dispatch,env}.subr: updated. subr/ex_pkg_exec.subr:ex_pkg_exec(): honour `ALL' and `LAST'. vars/gcc.vars: updated. --- midipix.env | 93 +++++++++++++++++++++++++++++++------------------------------ 1 file changed, 48 insertions(+), 45 deletions(-) (limited to 'midipix.env') diff --git a/midipix.env b/midipix.env index 7a1ebb45..f0233986 100644 --- a/midipix.env +++ b/midipix.env @@ -9,29 +9,32 @@ # # Build {step,variable}s -DEFAULT_BUILD_STEPS=" - fetch_download fetch_extract \ - configure_patch_pre configure_autotools configure_patch configure \ - build \ - install_subdirs install_make install_files install_libs install install_rpm clean"; -DEFAULT_BUILD_VARS=" - AR BASE_DIR BUILD_DIR BUILD_STEPS_DISABLE BUILD_TYPE \ - CC CFLAGS_BUILD CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE \ - CFLAGS_CONFIGURE_EXTRA CONFIG_CACHE CONFIG_CACHE_EXTRA \ - CONFIG_CACHE_LOCAL CONFIGURE CONFIGURE_ARGS CONFIGURE_ARGS_EXTRA \ - CXX CXXFLAGS_CONFIGURE CXXFLAGS_CONFIGURE_EXTRA \ - DEPENDS DESTDIR DESTDIR_HOST DISABLED ENV_VARS_EXTRA \ - FNAME FORCE_AUTORECONF GITROOT INHERIT_FROM INSTALL_FILES \ - INSTALL_FILES_DESTDIR INSTALL_FILES_DESTDIR_EXTRA INSTALL_TARGET \ - INSTALL_TARGET_EXTRA IN_TREE LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE \ - LDFLAGS_CONFIGURE_EXTRA LIBTOOL MAKE MAKE_INSTALL_VNAME \ - MAKE_SUBDIRS MAKEFLAGS_BUILD MAKEFLAGS_BUILD_EXTRA \ - MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA MAKEFLAGS_VERBOSITY \ - MIRRORS MIRRORS_GIT SOFORT_FORCE SOFORT_NATIVE_CC SOFORT_NATIVE_CFLAGS \ - SOFORT_NATIVE_CFLAGS_EXTRA SOFORT_NATIVE_CXX SOFORT_NATIVE_CXXFLAGS \ - SOFORT_NATIVE_CXXFLAGS_EXTRA SOFORT_NATIVE_LD SOFORT_NATIVE_LDFLAGS \ - SOFORT_NATIVE_LDFLAGS_EXTRA NO_CLEAN NO_CLEAN_BASE_DIR NO_LOG_VARS \ - PYTHON PATCHES_EXTRA PKG_CONFIG PKG_CONFIG_LIBDIR PKGLIST_DISABLE PREFIX \ +DEFAULT_BUILD_STEPS=" \ + start \ + fetch_download fetch_extract \ + configure_patch_pre configure_autotools configure_patch configure \ + build \ + install_subdirs install_make install_files install_libs install install_rpm \ + clean \ + finish"; +DEFAULT_BUILD_VARS=" \ + AR BASE_DIR BUILD_DIR BUILD_STEPS_DISABLE BUILD_TYPE \ + CC CFLAGS_BUILD CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE \ + CFLAGS_CONFIGURE_EXTRA CONFIG_CACHE CONFIG_CACHE_EXTRA \ + CONFIG_CACHE_LOCAL CONFIGURE CONFIGURE_ARGS CONFIGURE_ARGS_EXTRA \ + CXX CXXFLAGS_CONFIGURE CXXFLAGS_CONFIGURE_EXTRA \ + DEPENDS DESTDIR DESTDIR_HOST DISABLED ENV_VARS_EXTRA \ + FNAME FORCE_AUTORECONF GITROOT INHERIT_FROM INSTALL_FILES \ + INSTALL_FILES_DESTDIR INSTALL_FILES_DESTDIR_EXTRA INSTALL_TARGET \ + INSTALL_TARGET_EXTRA IN_TREE LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE \ + LDFLAGS_CONFIGURE_EXTRA LIBTOOL MAKE MAKE_INSTALL_VNAME \ + MAKE_SUBDIRS MAKEFLAGS_BUILD MAKEFLAGS_BUILD_EXTRA \ + MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA MAKEFLAGS_VERBOSITY \ + MIRRORS MIRRORS_GIT SOFORT_FORCE SOFORT_NATIVE_CC SOFORT_NATIVE_CFLAGS \ + SOFORT_NATIVE_CFLAGS_EXTRA SOFORT_NATIVE_CXX SOFORT_NATIVE_CXXFLAGS \ + SOFORT_NATIVE_CXXFLAGS_EXTRA SOFORT_NATIVE_LD SOFORT_NATIVE_LDFLAGS \ + SOFORT_NATIVE_LDFLAGS_EXTRA NO_CLEAN NO_CLEAN_BASE_DIR NO_LOG_VARS \ + PYTHON PATCHES_EXTRA PKG_CONFIG PKG_CONFIG_LIBDIR PKGLIST_DISABLE PREFIX \ RANLIB RPM_DISABLE SHA256SUM SUBDIR TARGET URL URLS_GIT VERSION"; # Path names @@ -45,36 +48,36 @@ DEFAULT_BUILD_VARS=" : ${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 \ +: ${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 +: ${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 +: ${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.lucioillanes.de/archives/ +: ${DEFAULT_MIRRORS:=" \ +https://midipix.org/mirror/ \ +https://midipix.lucioillanes.de/archives/ \ "}; -: ${DEFAULT_MIRRORS_GIT:=" -https://midipix.lucioillanes.de/repos_git/ +: ${DEFAULT_MIRRORS_GIT:=" \ +https://midipix.lucioillanes.de/repos_git/ \ "}; # Default flags & variables -- cgit v1.2.3