From b70ff5b419aebe6f86e737b1cc1be3b35c23a4dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luc=C3=ADa=20Andrea=20Illanes=20Albornoz?= Date: Sun, 26 Mar 2023 15:38:55 +0200 Subject: Generalise {configure,make} code. --- midipix.env | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) (limited to 'midipix.env') diff --git a/midipix.env b/midipix.env index 97371e92..a1a1edec 100644 --- a/midipix.env +++ b/midipix.env @@ -21,24 +21,24 @@ DEFAULT_BUILD_STEPS=" \ finish"; DEFAULT_BUILD_VARS=" \ AR AUTOCONF_CONFIG_GUESS BASE_DIR BUILD_DIR BUILD_STEPS_DISABLE \ - BUILD_TYPE CC CFLAGS_BUILD CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE \ + BUILD_TYPE CC CCLD CFLAGS_BUILD CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE \ CFLAGS_CONFIGURE_EXTRA CMAKE CMAKE_ARGS CMAKE_ARGS_EXTRA CMAKE_LISTFILE \ CONFIG_CACHE CONFIG_CACHE_EXTRA CONFIG_CACHE_LOCAL CONFIGURE CONFIGURE_ARGS \ CONFIGURE_ARGS_EXTRA CONFIGURE_ARGS_EXTRA_LIST CONFIGURE_ARGS_LIST CONFIGURE_TYPE \ 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_FILES_V2 INSTALL_TARGET \ - INSTALL_TARGET_EXTRA IN_TREE LDFLAGS_BUILD LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE \ + INSTALL_TARGET_EXTRA IN_TREE LD LDFLAGS_BUILD LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE \ LDFLAGS_CONFIGURE_EXTRA LIBTOOL MAKE MAKEFLAGS_BUILD MAKEFLAGS_BUILD_EXTRA \ MAKEFLAGS_BUILD_EXTRA_LIST MAKEFLAGS_BUILD_LIST MAKEFLAGS_INSTALL \ MAKEFLAGS_INSTALL_EXTRA MAKEFLAGS_INSTALL_EXTRA_LIST MAKEFLAGS_INSTALL_LIST \ - MAKEFLAGS_PARALLELISE MAKEFLAGS_VERBOSITY MAKE_INSTALL_VNAME MAKE_SUBDIRS MIRRORS \ - MIRRORS_GIT NO_CLEAN NO_CLEAN_BASE_DIR NO_CLEAN_BUILD_DIR NO_LOG_VARS PATCHES_EXTRA \ - PKG_CONFIG PKG_CONFIG_LIBDIR PKGLIST_DISABLE PREFIX PYTHON RANLIB RPM_DISABLE \ - SHA256SUM 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 SUBDIR TARGET \ - URL URLS_GIT VARS_FILE VERSION"; + MAKEFLAGS_LOADAVG MAKEFLAGS_PARALLELISE MAKEFLAGS_VERBOSITY MAKE_INSTALL_VNAME \ + MAKE_SUBDIRS MIRRORS MIRRORS_GIT NO_CLEAN NO_CLEAN_BASE_DIR NO_CLEAN_BUILD_DIR \ + NO_LOG_VARS PATCHES_EXTRA PKG_CONFIG PKG_CONFIG_LIBDIR PKGLIST_DISABLE PREFIX \ + PYTHON RANLIB RPM_DISABLE SHA256SUM 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 SUBDIR TARGET URL URLS_GIT VARS_FILE VERSION"; \ # # Prerequisite commands @@ -142,13 +142,16 @@ rtl_get_var_unsafe \$DEFAULT_LDFLAGS_RUNTIME -u "DEFAULT_LDFLAGS_${BUILD_KIND}_R # Target-relative toolchain defaults : ${DEFAULT_CROSS_AR:=${DEFAULT_TARGET}-ar}; : ${DEFAULT_CROSS_CC:=${DEFAULT_TARGET}-gcc}; +: ${DEFAULT_CROSS_CCLD:=${DEFAULT_TARGET}-gcc}; : ${DEFAULT_CROSS_CMAKE:=cmake}; : ${DEFAULT_CROSS_CXX:=${DEFAULT_TARGET}-g++}; +: ${DEFAULT_CROSS_LD:=${DEFAULT_TARGET}-ld}; : ${DEFAULT_CROSS_LIBTOOL:=slibtool}; : ${DEFAULT_CROSS_MAKE:=make}; : ${DEFAULT_CROSS_RANLIB:=${DEFAULT_TARGET}-ranlib}; : ${DEFAULT_HOST_AR:=ar}; : ${DEFAULT_HOST_CC:=gcc}; +: ${DEFAULT_HOST_CCLD:=gcc}; : ${DEFAULT_HOST_CMAKE:=cmake}; : ${DEFAULT_HOST_CXX:=g++}; : ${DEFAULT_HOST_LD:=ld}; @@ -159,6 +162,7 @@ rtl_get_var_unsafe \$DEFAULT_LDFLAGS_RUNTIME -u "DEFAULT_LDFLAGS_${BUILD_KIND}_R : ${DEFAULT_HOST_RANLIB:=ranlib}; : ${DEFAULT_NATIVE_AR:=${DEFAULT_TARGET}-ar}; : ${DEFAULT_NATIVE_CC:=${DEFAULT_TARGET}-gcc}; +: ${DEFAULT_NATIVE_CCLD:=${DEFAULT_TARGET}-gcc}; : ${DEFAULT_NATIVE_CMAKE:=cmake}; : ${DEFAULT_NATIVE_CXX:=${DEFAULT_TARGET}-g++}; : ${DEFAULT_NATIVE_LD:=${DEFAULT_TARGET}-ld}; @@ -175,7 +179,8 @@ rtl_get_var_unsafe \$DEFAULT_LDFLAGS_RUNTIME -u "DEFAULT_LDFLAGS_${BUILD_KIND}_R : ${DEFAULT_GITROOT:=git://midipix.org}; : ${DEFAULT_GITROOT_HEAD:=git://midipix.org}; : ${DEFAULT_MAKE_INSTALL_VNAME:=DESTDIR}; -: ${DEFAULT_MAKEFLAGS_PARALLELISE:="-j${DEFAULT_BUILD_CPUS} -l${DEFAULT_BUILD_CPUS}"}; +: ${DEFAULT_MAKEFLAGS_LOADAVG:="-l${DEFAULT_BUILD_CPUS}"}; +: ${DEFAULT_MAKEFLAGS_PARALLELISE:="-j${DEFAULT_BUILD_CPUS}"}; : ${DEFAULT_MAKEFLAGS_VERBOSITY:="V=99 VERBOSE=1"}; : ${DEFAULT_GIT_ARGS:=""}; : ${DEFAULT_TIMESTAMP_FMT:="%Y/%m/%d %H:%M:%S"}; @@ -197,7 +202,7 @@ rtl_get_var_unsafe \$DEFAULT_LDFLAGS_RUNTIME -u "DEFAULT_LDFLAGS_${BUILD_KIND}_R : ${DEFAULT_SOFORT_NATIVE_CFLAGS:="-I${PREFIX}/include"}; : ${DEFAULT_SOFORT_NATIVE_CXX:="${DEFAULT_HOST_CXX}"}; : ${DEFAULT_SOFORT_NATIVE_CXXFLAGS:="-I${PREFIX}/include"}; -: ${DEFAULT_SOFORT_NATIVE_LD:="${DEFAULT_HOST_LD}"}; +: ${DEFAULT_SOFORT_NATIVE_LD:="${DEFAULT_HOST_CCLD}"}; : ${DEFAULT_SOFORT_NATIVE_LDFLAGS:="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib"}; # -- cgit v1.2.3