From 7d1e643272bf10e0323ed3050b33bfd6322219fd Mon Sep 17 00:00:00 2001 From: Mitch Capper Date: Mon, 13 Jan 2025 16:48:11 -0800 Subject: [PATCH] Make script build update simplification --- build/README.md | 8 +++----- build/f_make_build.sh | 7 +++---- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/build/README.md b/build/README.md index 4df78b8..b6d9e6a 100644 --- a/build/README.md +++ b/build/README.md @@ -475,20 +475,18 @@ after switch to master and patch line (but in that block) add: ## make ### Template Script Args -`--BUILD_NAME make --GitRepo https://git.savannah.gnu.org/git/make.git --GNU_LIBS_BOOTSTRAP_EXTRAS_ADD "--symlink --without-tests" --BUILD_ADDL_CFLAGS -D_WIN32 -D_CRT_SECURE_NO_WARNINGS /wd4668 --GNU_LIBS_ADDL "opendir" "flexmember" "waitpid" "fnmatch-gnu" "glob" "strcasestr" --BUILD_MSVC_RUNTIME_INFO_ADD_TO_C_AND_LDFLAGS=1 --CONFIG_CMD_ADDL="ac_cv_func_waitpid=yes" "--enable-case-insensitive-file-system"` +`--BUILD_NAME make --GitRepo https://git.savannah.gnu.org/git/make.git --GNU_LIBS_BOOTSTRAP_EXTRAS_ADD "--symlink --without-tests" --BUILD_ADDL_CFLAGS -D_WIN32 -D_CRT_SECURE_NO_WARNINGS /wd4668 --GNU_LIBS_ADDL "opendir" "flexmember" "waitpid" "fnmatch-gnu" "glob" "strcasestr" --GNU_LIBS_ADD_TO_REPO=1 --BUILD_MSVC_RUNTIME_INFO_ADD_TO_C_AND_LDFLAGS=1 --CONFIG_CMD_ADDL="ac_cv_func_waitpid=yes" "--enable-case-insensitive-file-system"` ### Modifications make ships with a bunch of gnulib baked in but doesn't use gnulib proper we change that to get our latest benefits and remove their compat items. After our clone add section: ```bash - export GNULIB_SRCDIR="$BLD_CONFIG_SRC_FOLDER/gnulib" + export GNULIB_SRCDIR="$(convert_to_msys_path "${BLD_CONFIG_SRC_FOLDER}")/gnulib" export ACLOCAL_FLAGS="-I gl/m4" - if [[ -z $SKIP_STEP || $SKIP_STEP == "gnulib_add" ]]; then + if [[ -z $SKIP_STEP || $SKIP_STEP == "gnulib_strip" ]]; then rm src/w32/include/dirent.h src/w32/compat/dirent.c rm gl/lib/* rm gl/modules/* - rm build-aux/{compile,ar-lib} sed -i -E "s#(make-glob|make-macros)##g" bootstrap.conf - git clone --recurse-submodules https://github.com/coreutils/gnulib.git SKIP_STEP="" fi ``` diff --git a/build/f_make_build.sh b/build/f_make_build.sh index c119c2c..845f354 100644 --- a/build/f_make_build.sh +++ b/build/f_make_build.sh @@ -8,7 +8,7 @@ BLD_CONFIG_BUILD_ADDL_CFLAGS=( "-D_WIN32" "-D_CRT_SECURE_NO_WARNINGS" "/wd4668" BLD_CONFIG_GNU_LIBS_ADDL=( "opendir" "flexmember" "waitpid" "fnmatch-gnu" "glob" "strcasestr" ) BLD_CONFIG_BUILD_MSVC_RUNTIME_INFO_ADD_TO_C_AND_LDFLAGS=1 BLD_CONFIG_CONFIG_CMD_ADDL=( "ac_cv_func_waitpid=yes" "--enable-case-insensitive-file-system" ) - +BLD_CONFIG_GNU_LIBS_ADD_TO_REPO=1 # BLD_CONFIG_BUILD_FOLDER_NAME="myapp2"; #if you want it compiling in a diff folder # BLD_CONFIG_BUILD_DEBUG=1 @@ -21,14 +21,13 @@ fi if [[ -z $SKIP_STEP || $SKIP_STEP == "checkout" ]]; then git_clone_and_add_ignore https://git.savannah.gnu.org/git/make.git . fi - #export GNULIB_SRCDIR="$BLD_CONFIG_SRC_FOLDER/gnulib" + export GNULIB_SRCDIR="$(convert_to_msys_path "${BLD_CONFIG_SRC_FOLDER}")/gnulib" export ACLOCAL_FLAGS="-I gl/m4" - if [[ -z $SKIP_STEP || $SKIP_STEP == "gnulib_add" ]]; then + if [[ -z $SKIP_STEP || $SKIP_STEP == "gnulib_strip" ]]; then rm src/w32/include/dirent.h src/w32/compat/dirent.c rm gl/lib/* rm gl/modules/* sed -i -E "s#(make-glob|make-macros)##g" bootstrap.conf - git clone --recurse-submodules https://github.com/coreutils/gnulib.git SKIP_STEP="" fi