GCC rightfully complains about redefined variables, as iterator declarations appear inside loops with a loop variable of the same name. This patch has been sent upstream. --- a/sets.cpp 2015-06-25 11:22:08.252821681 +0200 +++ b/sets.cpp 2015-06-25 11:22:23.239187985 +0200 @@ -768,11 +768,11 @@ ////////////////////////////////////////////// // Reset original missing status - vector::iterator i = PP->sample.begin(); - while ( i != PP->sample.end() ) + vector::iterator it = PP->sample.begin(); + while ( it != PP->sample.end() ) { - (*i)->missing = (*i)->flag; - ++i; + (*it)->missing = (*it)->flag; + ++it; } //////////////////////////////////////////////// --- a/elf.cpp 2009-10-10 18:00:21.000000000 +0200 +++ b/elf.cpp 2015-06-25 11:34:06.136835756 +0200 @@ -1175,10 +1175,10 @@ << setw(8) << gcnt << " " << setw(8) << (double)cnt / (double)gcnt << "\n"; - map::iterator i = chr_cnt.begin(); - while ( i != chr_cnt.end() ) + map::iterator it = chr_cnt.begin(); + while ( it != chr_cnt.end() ) { - int c = i->first; + int c = it->first; int x = chr_cnt.find( c )->second; int y = chr_gcnt.find( c )->second; @@ -1189,7 +1189,7 @@ << setw(8) << y << " " << setw(8) << (double)x / (double)y << "\n"; - ++i; + ++it; } } --- plink-1.07-src/idhelp.cpp 2009-10-10 18:00:22.000000000 +0200 +++ plink-1.07-src/idhelp.cpp.patched 2015-06-25 11:37:39.387204086 +0200 @@ -772,12 +772,12 @@ for (int j = 0 ; j < jointField.size(); j++ ) { set & jf = jointField[j]; - set::iterator j = jf.begin(); + set::iterator jit = jf.begin(); PP->printLOG(" { "); - while ( j != jf.end() ) + while ( jit != jf.end() ) { - PP->printLOG( (*j)->name + " " ); - ++j; + PP->printLOG( (*jit)->name + " " ); + ++jit; } PP->printLOG(" }"); } 62534f16c1dd1e22657ef2f3c916'>m4
AgeCommit message (Expand)Author
2024-12-12build: Fix detection of guile-ssh....Fixes <https://issues.guix.gnu.org/74800>. The check for make-session stopped working after update to 0.18.0. This commit adds the additional `#:config #f' to skip reading the ssh configuration, arguably we did not want to do that anyway. * m4/guix.m4 (GUIX_CHECK_GUILE_SSH): Add `#:config #f' to make-session call. Change-Id: Id6ea3860292159ac2e6cf2a77df5f720f66aa071 Signed-off-by: Ludovic Courtès <ludo@gnu.org> Reported-by: Dariqq <dariqq@posteo.net> Tomas Volf
2024-12-03gnu: bootstrap: Add support for x86_64-gnu, aka the 64bit Hurd....On commit: ec8a5ec15f898e864705e5a5c834532e3fa8d0a4 gnu: make-bootstrap: Update gcc-static to gcc-14, for the 64bit Hurd. Run: ./pre-inst-env guix build --target=x86_64-gnu bootstrap-tarballs Producing: /gnu/store/w1n7bdpn88plcc49h7n0jriaj41sgwx8-bootstrap-tarballs-0/ With guix hash -r: 15cb1xh7s2hhp8s0d81bjnw1759w9sh7ckc9n5jq2f3rqw6z76by * gnu/packages/bootstrap.scm (%bootstrap-executables): Add entries for x86_64-gnu. (%bootstrap-guile-hash, %bootstrap-coreutils&co, %bootstrap-binutils, %bootstrap-glibc, %bootstrap-gcc): Add entry for x86_64-gnu. * guix/packages.scm (%supported-systems, %hurd-systems): Add x86_64-gnu. (%cuirass-supported-systems): Remove x86_64-gnu. * guix/utils.scm (target-64bit?): Add x86_64-gnu. * m4/guix.m4: Add x86_64-gnu as a supported system. * doc/guix.texi (GNU Distribution): Add x86_64-gnu. Change-Id: I828159aedb3f66caba98e935083cc3682429f219 Janneke Nieuwenhuizen
2023-11-07build: Fix spelling in m4 macros....* m4/guix.m4 (GUIX_CHECK_GUILE_SSH): Fix spelling of parameter. (GUIX_CHECK_FILE_NAME_LIMITS): Fix spelling of maximum. Change-Id: I93c80441393622a4bc06daa475eee13874cca527 Efraim Flashner
2023-03-16build: Correct guix_system on musl libc distros....* m4/guix.m4 (GUIX_SYSTEM_TYPE): Add linux-musl* case. This prevents the macro from mis-parsing the host OS, which causes breakage when building from source. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Antero Mejr
2022-01-14gnu: bootstrap: Add support for riscv64-linux....On 7d93b21ab1c132990054372a9677c1639d54e631 gnu: glibc-for-bootstrap: Update patch. Run ./pre-inst-env guix build --target=riscv64-linux-gnu bootstrap-tarballs Producing /gnu/store/4hdzva9i0wyyfbgj1lmqc1wkk644pv07-bootstrap-tarballs-0 With guix hash -rx 1nj0fdgj08bbmfny01mp2blv7c3p2iciqh31zmf04ap5s7ygsqlp * gnu/packages/bootstrap.scm (%bootstrap-executables): Add entries for riscv64-linux. (%bootstrap-guile-hash, %bootstrap-coreutils&co, %bootstrap-binutils, %bootstrap-glibc, %bootstrap-gcc): Add entry for riscv64-linux. (raw-build-guile3): New procedure. (make-raw-bag): Use raw-build-guile3 for riscv64-linux. * guix/packages.scm (%supported-systems): Add riscv64-linux. (%cuirass-supported-systems): Remove riscv64-linux. * guix/utils.scm (target-64bit?): Add riscv64-linux. * m4/guix.m4: Add riscv64-linux as a supported system. * doc/guix.texi (GNU Distribution): Add riscv64-linux. Efraim Flashner