Changeset b369f3c
- Timestamp:
- May 18, 2011, 6:52:29 PM (13 years ago)
- Branches:
- clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
- Children:
- cf78d6b
- Parents:
- 0a4f15b
- Files:
-
- 4 added
- 3 deleted
- 6 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
BOOK/cross-tools/common/gcc-final.xml
r0a4f15b rb369f3c 22 22 <sect2 role="installation"> 23 23 <title>Installation of GCC Cross Compiler</title> 24 25 <para os="p1">The following patch contains a number of updates to the 26 &gcc-version; branch by the GCC developers:</para> 27 28 <screen os="p2"><userinput>patch -Np1 -i ../&gcc-branch_update-patch;</userinput></screen> 24 29 25 30 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" -
BOOK/final-system/common/gcc.xml
r0a4f15b rb369f3c 25 25 <sect2 role="installation"> 26 26 <title>Installation of GCC</title> 27 28 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 29 href="../../cross-tools/common/gcc-final.xml" 30 xpointer="xpointer(//*[@os='p1'])"/>: 31 32 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 33 href="../../cross-tools/common/gcc-final.xml" 34 xpointer="xpointer(//*[@os='p2'])"/> 27 35 28 36 <para os="d">Apply a <command>sed</command> substitution that will suppress the -
BOOK/general.ent
r0a4f15b rb369f3c 1 1 <?xml version="1.0" encoding="ISO-8859-1"?> 2 2 3 <!ENTITY month "0 4"> <!-- Use two digits -->4 <!ENTITY month_name " April">5 <!ENTITY day " 24"> <!-- Use two digits -->3 <!ENTITY month "05"> <!-- Use two digits --> 4 <!ENTITY month_name "May"> 5 <!ENTITY day "18"> <!-- Use two digits --> 6 6 <!ENTITY year "2011"> <!-- Use four digits --> 7 7 -
BOOK/introduction/common/changelog.xml
r0a4f15b rb369f3c 36 36 </listitem> 37 37 --> 38 39 <listitem> 40 <para>May 18, 2011</para> 41 <itemizedlist> 42 <listitem> 43 <para>[Jonathan] - Add GCC 4.6.0 Branch Update Patch -1.</para> 44 </listitem> 45 <listitem> 46 <para>[Jonathan] - Updated Vim Branch Update to -2.</para> 47 </listitem> 48 <listitem> 49 <para>[Jonathan] - Updated Bash Branch Update to -2.</para> 50 </listitem> 51 <listitem> 52 <para>[Jonathan] - Updated Ncurses Branch Update to -2.</para> 53 </listitem> 54 </itemizedlist> 55 </listitem> 38 56 39 57 <listitem> -
BOOK/patches.ent
r0a4f15b rb369f3c 5 5 <!-- Start of Common Patches --> 6 6 7 <!ENTITY bash-branch_update-patch "bash-&bash-version;-branch_update- 1.patch">8 <!ENTITY bash-branch_update-patch-md5 " ee7bbf5d36058487cbe23f5571a2c21c">9 <!ENTITY bash-branch_update-patch-size "1 2KB">7 <!ENTITY bash-branch_update-patch "bash-&bash-version;-branch_update-2.patch"> 8 <!ENTITY bash-branch_update-patch-md5 "6aef48cfd93b9109358eae0be9125946"> 9 <!ENTITY bash-branch_update-patch-size "16 KB"> 10 10 11 11 <!ENTITY cloog-ppl-autogen-patch "cloog-ppl-&cloog-ppl-version;-autogen-1.patch"> … … 29 29 <!ENTITY gcc-specs-patch-size "20 KB"> 30 30 31 <!ENTITY gcc-branch_update-patch "gcc-&gcc-version;-branch_update-1.patch"> 32 <!ENTITY gcc-branch_update-patch-md5 "3ff1f39dc12932736694bf6fb6a1846a"> 33 <!ENTITY gcc-branch_update-patch-size "1.5 MB" 34 31 35 <!ENTITY grep-fixes-patch "grep-&grep-version;-fixes-1.patch"> 32 36 <!ENTITY grep-fixes-patch-md5 "0cb36684847842adb17a1b3fb96f733d"> … … 49 53 <!ENTITY ncurses-bashfix-patch-size "4 KB"> 50 54 51 <!ENTITY ncurses-branch_update-patch "ncurses-&ncurses-version;-branch_update- 1.patch">52 <!ENTITY ncurses-branch_update-patch-md5 " 5361bccf700849ba968a8886cdfaa879">53 <!ENTITY ncurses-branch_update-patch-size " 324KB">55 <!ENTITY ncurses-branch_update-patch "ncurses-&ncurses-version;-branch_update-2.patch"> 56 <!ENTITY ncurses-branch_update-patch-md5 "125c256a66bd532c6c290dc2adfb7bc4"> 57 <!ENTITY ncurses-branch_update-patch-size "796 KB"> 54 58 55 59 <!ENTITY perl-libc-patch "perl-&perl-version;-libc-1.patch"> … … 70 74 71 75 <!ENTITY tar-man-patch "tar-&tar-version;-man-1.patch"> 72 <!ENTITY tar-man-patch-md5 " 79d962bddc4871b394e5f8e3267680fe">73 <!ENTITY tar-man-patch-size " 20KB">76 <!ENTITY tar-man-patch-md5 "074783d41f18c5c62a7cfc77e2678693"> 77 <!ENTITY tar-man-patch-size "76 KB"> 74 78 75 79 <!ENTITY texinfo-new_compressors-patch "texinfo-&texinfo-version;-new_compressors-1.patch"> … … 77 81 <!ENTITY texinfo-new_compressors-patch-size "2 KB"> 78 82 79 <!ENTITY vim-branch_update-patch "vim-&vim-version;-branch_update- 1.patch">80 <!ENTITY vim-branch_update-patch-md5 " c1866b7f2f945993b8fc2bb94606bc17">81 <!ENTITY vim-branch_update-patch-size " 220KB">83 <!ENTITY vim-branch_update-patch "vim-&vim-version;-branch_update-2.patch"> 84 <!ENTITY vim-branch_update-patch-md5 "3790140dd2fd1963f285e4ba1bce5d1f"> 85 <!ENTITY vim-branch_update-patch-size "552 KB"> 82 86 83 87 <!-- Start of multilib patches --> -
BOOK/temp-system/common/gcc.xml
r0a4f15b rb369f3c 22 22 <sect2 role="installation"> 23 23 <title>Installation of GCC</title> 24 25 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 26 href="../../cross-tools/common/gcc-final.xml" 27 xpointer="xpointer(//*[@os='p1'])"/>: 28 29 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 30 href="../../cross-tools/common/gcc-final.xml" 31 xpointer="xpointer(//*[@os='p2'])"/> 24 32 25 33 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" -
patches/bash-4.2-branch_update-2.patch
r0a4f15b rb369f3c 1 Submitted By: Jo e Ciccone <jciccone@gmail.com>2 Date: 04-16-20111 Submitted By: Jonathan Norman (jonathan at bluesquarelinux.co.uk) 2 Date: 2011-05-16 3 3 Initial Package Version: 4.2 4 4 Origin: Upstream 5 Upstream Status: From Upstream6 Description: Contains all upstream patches up to 4.2-0 085 Upstream Status: Applied 6 Description: Contains all upstream patches up to 4.2-010 7 7 8 diff -Naur bash-4.2.orig/builtins/fc.def bash-4.2/builtins/fc.def 9 --- bash-4.2.orig/builtins/fc.def 2010-05-30 22:25:38.000000000 +0000 10 +++ bash-4.2/builtins/fc.def 2011-05-16 23:42:00.796961011 +0000 11 @@ -304,7 +304,7 @@ 12 last_hist = i - rh - hist_last_line_added; 13 14 /* XXX */ 15 - if (saved_command_line_count > 0 && i == last_hist && hlist[last_hist] == 0) 16 + if (i == last_hist && hlist[last_hist] == 0) 17 while (last_hist >= 0 && hlist[last_hist] == 0) 18 last_hist--; 19 if (last_hist < 0) 20 @@ -475,7 +475,7 @@ 21 HIST_ENTRY **hlist; 22 { 23 int sign, n, clen, rh; 24 - register int i, j; 25 + register int i, j, last_hist; 26 register char *s; 27 28 sign = 1; 29 @@ -495,7 +495,15 @@ 30 has been enabled (interactive or not) should use it in the last_hist 31 calculation as if it were on. */ 32 rh = remember_on_history || ((subshell_environment & SUBSHELL_COMSUB) && enable_history_list); 33 - i -= rh + hist_last_line_added; 34 + last_hist = i - rh - hist_last_line_added; 35 + 36 + if (i == last_hist && hlist[last_hist] == 0) 37 + while (last_hist >= 0 && hlist[last_hist] == 0) 38 + last_hist--; 39 + if (last_hist < 0) 40 + return (-1); 41 + 42 + i = last_hist; 43 44 /* No specification defaults to most recent command. */ 45 if (command == NULL) 8 46 diff -Naur bash-4.2.orig/builtins/printf.def bash-4.2/builtins/printf.def 9 --- bash-4.2.orig/builtins/printf.def 2010-11-23 1 0:02:55.000000000 -050010 +++ bash-4.2/builtins/printf.def 2011-0 4-16 16:50:36.379215007 -040047 --- bash-4.2.orig/builtins/printf.def 2010-11-23 15:02:55.000000000 +0000 48 +++ bash-4.2/builtins/printf.def 2011-05-16 23:41:55.617535899 +0000 11 49 @@ -465,6 +465,9 @@ 12 50 secs = shell_start_time; /* roughly $SECONDS */ … … 20 58 free (timefmt); 21 59 diff -Naur bash-4.2.orig/lib/glob/gmisc.c bash-4.2/lib/glob/gmisc.c 22 --- bash-4.2.orig/lib/glob/gmisc.c 2011-02-05 16:11:17.000000000 -050023 +++ bash-4.2/lib/glob/gmisc.c 2011-0 4-16 16:50:36.371215007 -040060 --- bash-4.2.orig/lib/glob/gmisc.c 2011-02-05 21:11:17.000000000 +0000 61 +++ bash-4.2/lib/glob/gmisc.c 2011-05-16 23:41:53.037822234 +0000 24 62 @@ -77,8 +77,8 @@ 25 63 wchar_t *wpat; … … 223 261 } 224 262 diff -Naur bash-4.2.orig/lib/readline/callback.c bash-4.2/lib/readline/callback.c 225 --- bash-4.2.orig/lib/readline/callback.c 2010-06-06 1 2:18:58.000000000 -0400226 +++ bash-4.2/lib/readline/callback.c 2011-0 4-16 16:50:36.359215007 -0400263 --- bash-4.2.orig/lib/readline/callback.c 2010-06-06 16:18:58.000000000 +0000 264 +++ bash-4.2/lib/readline/callback.c 2011-05-16 23:41:51.689971838 +0000 227 265 @@ -148,6 +148,9 @@ 228 266 eof = _rl_vi_domove_callback (_rl_vimvcxt); … … 236 274 #endif 237 275 diff -Naur bash-4.2.orig/lib/readline/vi_mode.c bash-4.2/lib/readline/vi_mode.c 238 --- bash-4.2.orig/lib/readline/vi_mode.c 2010-11-2 0 19:51:39.000000000 -0500239 +++ bash-4.2/lib/readline/vi_mode.c 2011-0 4-16 16:50:36.359215007 -0400276 --- bash-4.2.orig/lib/readline/vi_mode.c 2010-11-21 00:51:39.000000000 +0000 277 +++ bash-4.2/lib/readline/vi_mode.c 2011-05-16 23:41:51.689971838 +0000 240 278 @@ -1114,7 +1114,7 @@ 241 279 rl_beg_of_line (1, c); … … 248 286 /* XXX - these need to handle rl_universal_argument bindings */ 249 287 diff -Naur bash-4.2.orig/parse.y bash-4.2/parse.y 250 --- bash-4.2.orig/parse.y 2011-01-02 15:48:11.000000000 -0500251 +++ bash-4.2/parse.y 2011-0 4-16 16:50:36.379215007 -0400288 --- bash-4.2.orig/parse.y 2011-01-02 20:48:11.000000000 +0000 289 +++ bash-4.2/parse.y 2011-05-16 23:41:55.613536343 +0000 252 290 @@ -5135,6 +5135,9 @@ 253 291 case 'A': … … 261 299 if (c == 'd') 262 300 diff -Naur bash-4.2.orig/patchlevel.h bash-4.2/patchlevel.h 263 --- bash-4.2.orig/patchlevel.h 2010-06-1 2 20:14:48.000000000 -0400264 +++ bash-4.2/patchlevel.h 2011-0 4-16 16:50:36.387215007 -0400301 --- bash-4.2.orig/patchlevel.h 2010-06-13 00:14:48.000000000 +0000 302 +++ bash-4.2/patchlevel.h 2011-05-16 23:42:02.092817179 +0000 265 303 @@ -25,6 +25,6 @@ 266 304 regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh … … 268 306 269 307 -#define PATCHLEVEL 0 270 +#define PATCHLEVEL 8308 +#define PATCHLEVEL 10 271 309 272 310 #endif /* _PATCHLEVEL_H_ */ 311 diff -Naur bash-4.2.orig/print_cmd.c bash-4.2/print_cmd.c 312 --- bash-4.2.orig/print_cmd.c 2010-05-30 22:34:08.000000000 +0000 313 +++ bash-4.2/print_cmd.c 2011-05-16 23:42:02.092817179 +0000 314 @@ -315,6 +315,7 @@ 315 cprintf ("( "); 316 skip_this_indent++; 317 make_command_string_internal (command->value.Subshell->command); 318 + PRINT_DEFERRED_HEREDOCS (""); 319 cprintf (" )"); 320 break; 321 322 @@ -592,6 +593,7 @@ 323 newline ("do\n"); 324 indentation += indentation_amount; 325 make_command_string_internal (arith_for_command->action); 326 + PRINT_DEFERRED_HEREDOCS (""); 327 semicolon (); 328 indentation -= indentation_amount; 329 newline ("done"); 330 @@ -653,6 +655,7 @@ 331 } 332 333 make_command_string_internal (group_command->command); 334 + PRINT_DEFERRED_HEREDOCS (""); 335 336 if (inside_function_def) 337 { 273 338 diff -Naur bash-4.2.orig/sig.c bash-4.2/sig.c 274 --- bash-4.2.orig/sig.c 2010-11-23 08:21:22.000000000 -0500275 +++ bash-4.2/sig.c 2011-0 4-16 16:50:36.387215007 -0400339 --- bash-4.2.orig/sig.c 2010-11-23 13:21:22.000000000 +0000 340 +++ bash-4.2/sig.c 2011-05-16 23:41:59.501104844 +0000 276 341 @@ -46,6 +46,7 @@ 277 342 … … 303 368 termsig_handler (sig); 304 369 diff -Naur bash-4.2.orig/subst.c bash-4.2/subst.c 305 --- bash-4.2.orig/subst.c 2011-01-02 16:12:51.000000000 -0500306 +++ bash-4.2/subst.c 2011-0 4-16 16:50:36.383215007 -0400370 --- bash-4.2.orig/subst.c 2011-01-02 21:12:51.000000000 +0000 371 +++ bash-4.2/subst.c 2011-05-16 23:41:58.205248678 +0000 307 372 @@ -1379,10 +1379,12 @@ 308 373 slen = strlen (string + *sindex) + *sindex; … … 349 414 else 350 415 diff -Naur bash-4.2.orig/subst.h bash-4.2/subst.h 351 --- bash-4.2.orig/subst.h 2010-12-0 2 20:21:29.000000000 -0500352 +++ bash-4.2/subst.h 2011-0 4-16 16:50:36.359215007 -0400416 --- bash-4.2.orig/subst.h 2010-12-03 01:21:29.000000000 +0000 417 +++ bash-4.2/subst.h 2011-05-16 23:41:50.378117447 +0000 353 418 @@ -56,6 +56,7 @@ 354 419 #define SX_NOLONGJMP 0x0040 /* don't longjmp on fatal error */ … … 360 425 STRING, and returns a pointer to it. */ 361 426 diff -Naur bash-4.2.orig/variables.c bash-4.2/variables.c 362 --- bash-4.2.orig/variables.c 2011-01-2 4 20:07:48.000000000 -0500363 +++ bash-4.2/variables.c 2011-0 4-16 16:50:36.379215007 -0400427 --- bash-4.2.orig/variables.c 2011-01-25 01:07:48.000000000 +0000 428 +++ bash-4.2/variables.c 2011-05-16 23:41:56.917391622 +0000 364 429 @@ -3653,6 +3653,22 @@ 365 430 return n; … … 411 476 412 477 diff -Naur bash-4.2.orig/variables.h bash-4.2/variables.h 413 --- bash-4.2.orig/variables.h 2010-12-0 2 20:22:01.000000000 -0500414 +++ bash-4.2/variables.h 2011-0 4-16 16:50:36.375215007 -0400478 --- bash-4.2.orig/variables.h 2010-12-03 01:22:01.000000000 +0000 479 +++ bash-4.2/variables.h 2011-05-16 23:41:55.613536343 +0000 415 480 @@ -313,6 +313,7 @@ 416 481
Note:
See TracChangeset
for help on using the changeset viewer.