[Cmake-commits] [cmake-commits] king committed bootstrap 1.120 1.121

cmake-commits at cmake.org cmake-commits at cmake.org
Wed Jun 10 13:39:42 EDT 2009


Update of /cvsroot/CMake/CMake
In directory public:/mounts/ram/cvs-serv21693

Modified Files:
	bootstrap 
Log Message:
BUG: Fix bootstrap for Debian Almquist Shell

The Debian Almquist Shell (dash) provides minimal POSIX compliance
instead of the power of bash.  It converts literal '\n' to a real
newline even in a single-quoted string.  This works around the problem
by avoiding the literal.  We can no longer use HEREDOC.


Index: bootstrap
===================================================================
RCS file: /cvsroot/CMake/CMake/bootstrap,v
retrieving revision 1.120
retrieving revision 1.121
diff -C 2 -d -r1.120 -r1.121
*** bootstrap	10 Jun 2009 17:04:25 -0000	1.120
--- bootstrap	10 Jun 2009 17:39:40 -0000	1.121
***************
*** 673,677 ****
  #endif
  {
!   printf("%d\n", (argv != 0));
    return argc-1;
  }
--- 673,677 ----
  #endif
  {
!   printf("%d%c", (argv != 0), (char)0x0a);
    return argc-1;
  }
***************
*** 772,776 ****
  echo '
  #include <stdio.h>
! int main(){ printf("1\n"); return 0; }
  ' > "test.c"
  cmake_original_make_flags="${cmake_make_flags}"
--- 772,776 ----
  echo '
  #include <stdio.h>
! int main(){ printf("1%c", (char)0x0a); return 0; }
  ' > "test.c"
  cmake_original_make_flags="${cmake_make_flags}"



More information about the Cmake-commits mailing list