Autoreconf must run after we run our fixes, fix workflow cache key in…

…case deps change
mitchcapper · Dec 7, 2024 · 9ea521a · 9ea521a
1 parent d902d65
commit 9ea521a
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/.github/workflows/restore_deps_to_cache.yml b/.github/workflows/restore_deps_to_cache.yml
@@ -29,7 +29,7 @@ jobs:
       with:
         path: |
           d:/artifacts
-        key: ${{ inputs.BuildPkg }}
+        key: ${{ inputs.BuildPkg }}-${{ inputs.RequiredDeps }}
         lookup-only: true
 
     - uses: actions/[email protected]
@@ -129,7 +129,7 @@ jobs:
       with:
         path: |
           d:/artifacts
-        key: ${{ inputs.BuildPkg }}
+        key: ${{ inputs.BuildPkg }}-${{ inputs.RequiredDeps }}
     # - name: Debug Session
     #   if: ${{ failure() }}
     #   run: D:/a/docs/docs/.github/debug_ssh_start.ps1

diff --git a/build/f_libhsts_build.sh b/build/f_libhsts_build.sh
@@ -32,6 +32,7 @@ fi
 		gnulib_ensure_buildaux_scripts_copied
 		autoreconf --symlink --verbose --install
 		libtool_fixes "build-aux/ltmain.sh" "m4/libtool.m4"
+		autoreconf --verbose #update for libtool fixes
 		SKIP_STEP=""
 	fi
 

diff --git a/build/f_libpsl_build.sh b/build/f_libpsl_build.sh
@@ -52,8 +52,9 @@ fi
 			gnulib_add_addl_modules_to_bootstrap;		
 			gnulib_ensure_buildaux_scripts_copied;
 			setup_gnulibtool_py_autoconfwrapper #needed for generated .mk/.ac files but if just stock then the below line likely works
-			libtool_fixes "build-aux/ltmain.sh" "m4/libtool.m4"
 			./bootstrap --no-bootstrap-sync --no-git --gnulib-srcdir=gnulib --skip-po
+			libtool_fixes "build-aux/ltmain.sh" "m4/libtool.m4"			
+			autoreconf --verbose #update for libtool fixes
 			SKIP_STEP=""
 		fi
 	fi

diff --git a/build/f_wget2_build.sh b/build/f_wget2_build.sh
@@ -41,6 +41,7 @@ fi
 		SKIP_STEP=""
 	fi
 	OLDPATH="$PATH"
+	# build-aux\ltmain.sh 
 
 	if [[ -z $SKIP_STEP || $SKIP_STEP == "vcpkg" ]]; then
 		TAR_BASE=$(get_install_prefix_for_pkg "tar")
@@ -76,12 +77,15 @@ fi
 		if [[ -z $SKIP_STEP || $SKIP_STEP == "bootstrap" ]]; then
 			gnulib_ensure_buildaux_scripts_copied;
 			setup_gnulibtool_py_autoconfwrapper #needed for generated .mk/.ac files but if just stock then the below line likely works
+			libtool_fixes "build-aux/ltmain.sh" "m4/libtool.m4"
 			./bootstrap --no-bootstrap-sync --no-git --gnulib-srcdir=gnulib --skip-po
 			SKIP_STEP=""
 		fi
 	fi
 	if [[ $SKIP_STEP == "autoconf" ]]; then #not empty allowed as if we bootstrapped above we dont need to run nautoconf
 		autoreconf --symlink --verbose --install
+		libtool_fixes "build-aux/ltmain.sh" "m4/libtool.m4"
+		autoreconf --verbose #update for libtool fixes
 		gnulib_ensure_buildaux_scripts_copied;
 		SKIP_STEP="" #to do all the other steps
 	fi
@@ -110,7 +114,7 @@ fi
 	if [[ $CALL_CMD == "log_undefines" ]]; then
 		FL="undefined.txt"
 		echo "Logging undefined symbols to ${FL}"
-		make | rg --no-line-number -oP "unresolved external symbol.+referenced" | sed -E 's#unresolved external symbol(.+)referenced#\1#g' | sort -u > $FL
+		make | rg --no-line-number -oP "unresolved external symbol.+referenced" | sed -E 's#unresolved external symbol(.+)referenced#\\1#g' | sort -u > $FL
 		exit 1
 	fi
 	make -j 8 || make

diff --git a/helpers_gnu.sh b/helpers_gnu.sh
@@ -130,6 +130,8 @@ function libtool_fixes(){
 	# first the newer libtools have more windows support but that makes things actually a bit harder as it has some issues
 	# first it puts the export symbol commands in a .exp file but that is used by the compiler too so .expsym is better and used elsewhere
 	# Secondly it does -Fe [arg] but it needs to be next to the -Fe[arg]
+	# ie libtool_fixes "build-aux/ltmain.sh" "m4/libtool.m4"
+	# note you must run autoreconf after this if it wont automatically happen.  Sometimes these will not be present until after the first bootstrap though so likely want to run autoreconf ourselves.
 #	local POS_FILES=("build-aux/ltmain.sh" "m4/libtool.m4")
 #	for fl in "${POS_FILES[@]}"; do
 #		if [[ -e "$fl" ]]; then