Signed-off-by: Richard Purdie <[email protected]> --- .../gawk/files/randtest-fix.patch | 140 ------------------ ...c-re-enable-disabled-printf-features.patch | 8 +- .../gawk/{gawk_5.4.0.bb => gawk_5.4.1.bb} | 3 +- 3 files changed, 5 insertions(+), 146 deletions(-) delete mode 100644 meta/recipes-extended/gawk/files/randtest-fix.patch rename meta/recipes-extended/gawk/{gawk_5.4.0.bb => gawk_5.4.1.bb} (96%)
diff --git a/meta/recipes-extended/gawk/files/randtest-fix.patch b/meta/recipes-extended/gawk/files/randtest-fix.patch deleted file mode 100644 index ac26eef8d14..00000000000 --- a/meta/recipes-extended/gawk/files/randtest-fix.patch +++ /dev/null @@ -1,140 +0,0 @@ -From f2250f4bc864913437619af7a9834a1c24915acd Mon Sep 17 00:00:00 2001 -From: "Arnold D. Robbins" <[email protected]> -Date: Thu, 28 May 2026 09:52:41 -0400 -Subject: [PATCH] Improve test/randtest.sh. - -Backport upstream fix to improve stability of randtest.sh by retrying -when sigma is too small, avoiding intermittent failures. - -Upstream-Status: Backport [https://cgit.git.savannah.gnu.org/cgit/gawk.git/commit/?id=f2250f4bc864913437619af7a983] - -Signed-off-by: Aditya GS <[email protected]> - ---- - -diff --git a/test/randtest.sh b/test/randtest.sh -index 597376a8..6ae6f830 100755 ---- a/test/randtest.sh -+++ b/test/randtest.sh -@@ -45,68 +45,77 @@ $AWK 'BEGIN{ - nsamples=('$NSAMPLES'); - max_allowed_sigma=('$MAX_ALLOWED_SIGMA'); - nruns=('$NRUNS'); -- for(tau=0;tau<nsamples/2;tau++) corr[tau]=0; -+ max_retries=5 - -- for(run=0;run<nruns;run++) { -- sum=0; -+ for (retry=0; retry<max_retries; retry++) { -+ for(tau=0; tau<nsamples/2; tau++) corr[tau]=0; - -- # Fill an array with a sequence of samples that are a -- # function of pairs of rand() values. -+ for(run=0; run<nruns; run++) { -+ sum=0; - -- for(i=0;i<nsamples;i++) { -- samp[i]=((rand()-0.5)*(rand()-0.5))^2; -- sum=sum+samp[i]; -- } -+ # Fill an array with a sequence of samples that are a -+ # function of pairs of rand() values. - -- # Subtract off the mean of the sequence: -+ for(i=0; i<nsamples; i++) { -+ samp[i]=((rand()-0.5)*(rand()-0.5))^2; -+ sum=sum+samp[i]; -+ } - -- mean=sum/nsamples; -- for(i=0;i<nsamples;i++) samp[i]=samp[i]-mean; -+ # Subtract off the mean of the sequence: - -- # Calculate an autocorrelation function on the sequence. -- # Because the values of rand() should be independent, there -- # should be no peaks in the autocorrelation. -+ mean=sum/nsamples; -+ for(i=0;i<nsamples;i++) samp[i]=samp[i]-mean; - -- for(tau=0;tau<nsamples/2;tau++) { -- sum=0; -- for(i=0;i<nsamples/2;i++) sum=sum+samp[i]*samp[i+tau]; -- corr[tau]=corr[tau]+sum; -- } -+ # Calculate an autocorrelation function on the sequence. -+ # Because the values of rand() should be independent, there -+ # should be no peaks in the autocorrelation. - -- } -- # Normalize the autocorrelation to the tau=0 value. -+ for(tau=0; tau<nsamples/2; tau++) { -+ sum=0; -+ for(i=0;i<nsamples/2;i++) sum=sum+samp[i]*samp[i+tau]; -+ corr[tau]=corr[tau]+sum; -+ } - -- max_corr=corr[0]; -- for(tau=0;tau<nsamples/2;tau++) corr[tau]=corr[tau]/max_corr; -+ } -+ # Normalize the autocorrelation to the tau=0 value. - -- # OPTIONALLY Print out the autocorrelation values: -+ max_corr=corr[0]; -+ for(tau=0;tau<nsamples/2;tau++) corr[tau]=corr[tau]/max_corr; - -- # for(tau=0;tau<nsamples/2;tau++) print tau, corr[tau] > "pairpower_corr.data"; -+ # OPTIONALLY Print out the autocorrelation values: - -- # Calculate the sigma for the non-zero tau values: -+ # for(tau=0;tau<nsamples/2;tau++) print tau, corr[tau] > "pairpower_corr.data"; - -- power_sum=0; -+ # Calculate the sigma for the non-zero tau values: - -- for(tau=1;tau<nsamples/2;tau++) power_sum=power_sum+(corr[tau])^2; -+ power_sum=0; - -- sigma=sqrt(power_sum/(nsamples/2-1)); -+ for(tau=1;tau<nsamples/2;tau++) power_sum=power_sum+(corr[tau])^2; - -- # See if any of the correlations exceed a reasonable number of sigma: -+ sigma=sqrt(power_sum/(nsamples/2-1)); - -- passed=1; -- for(tau=1;tau<nsamples/2;tau++) { -- if ( abs(corr[tau])/sigma > max_allowed_sigma ) { -- print "Tau=", tau ", Autocorr=", corr[tau]/sigma, "sigma"; -- passed=0; -- } -+ if (sigma < 1e-6) { -+ print "Sigma too small, retrying run", retry -+ continue - } -- if(!passed) { -- print "Test failed." -- exit(1); -+ -+ # See if any of the correlations exceed a reasonable number of sigma: -+ -+ for(tau=1;tau<nsamples/2;tau++) { -+ if (abs(corr[tau])/sigma > max_allowed_sigma) { -+ print "Tau=", tau ", Autocorr=", corr[tau]/sigma, "sigma"; -+ print "Test failed." -+ exit 1 -+ } - } -- else exit (0); -+ -+ exit 0 - } - -+ print "Test failed after retries due to unstable sigma" -+ exit 1 -+} -+ - function abs(abs_input) { return(sqrt(abs_input^2)) ; } - ' - --- -2.34.1 - diff --git a/meta/recipes-extended/gawk/gawk/0001-configure.ac-re-enable-disabled-printf-features.patch b/meta/recipes-extended/gawk/gawk/0001-configure.ac-re-enable-disabled-printf-features.patch index bcbc5695314..882edca1122 100644 --- a/meta/recipes-extended/gawk/gawk/0001-configure.ac-re-enable-disabled-printf-features.patch +++ b/meta/recipes-extended/gawk/gawk/0001-configure.ac-re-enable-disabled-printf-features.patch @@ -1,4 +1,4 @@ -From 9ce3184188e3fa275fde0258a165f4446a6e80f7 Mon Sep 17 00:00:00 2001 +From 53808cbdab1d12c99a4fbadf4ea134b98664e8c7 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Fri, 22 Nov 2024 12:13:58 +0100 Subject: [PATCH] configure.ac: re-enable disabled printf features @@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index 0ccd460..7df7e5b 100644 +index 471fbc1..d7d173a 100644 --- a/configure.ac +++ b/configure.ac -@@ -400,7 +400,7 @@ int main() +@@ -402,7 +402,7 @@ int main() ])], has_f_format=yes, has_f_format=no, @@ -24,7 +24,7 @@ index 0ccd460..7df7e5b 100644 ) if test "$has_f_format" = yes then -@@ -429,7 +429,7 @@ int main() +@@ -431,7 +431,7 @@ int main() ])], has_a_format=yes, has_a_format=no, diff --git a/meta/recipes-extended/gawk/gawk_5.4.0.bb b/meta/recipes-extended/gawk/gawk_5.4.1.bb similarity index 96% rename from meta/recipes-extended/gawk/gawk_5.4.0.bb rename to meta/recipes-extended/gawk/gawk_5.4.1.bb index 4193456c14f..8e8bc34152f 100644 --- a/meta/recipes-extended/gawk/gawk_5.4.0.bb +++ b/meta/recipes-extended/gawk/gawk_5.4.1.bb @@ -28,10 +28,9 @@ PACKAGECONFIG[pma-if-64bit] = "--enable-pma,--disable-pma, " SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.xz \ file://run-ptest \ file://0001-configure.ac-re-enable-disabled-printf-features.patch \ - file://randtest-fix.patch \ " -SRC_URI[sha256sum] = "3dd430f0cd3b4428c6c3f6afc021b9cd3c1f8c93f7a688dc268ca428a90b4ac1" +SRC_URI[sha256sum] = "07f6f7342b7febe4313fc2c2542ad93d64fe20ad8717200109f105a826f5fd37" inherit autotools gettext texinfo update-alternatives
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#240711): https://lists.openembedded.org/g/openembedded-core/message/240711 Mute This Topic: https://lists.openembedded.org/mt/120220629/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
