فهرست منبع

Remove dependency to Bison/Yacc by applying a vendor patch to a generated file.

Ralf S. Engelschall 19 سال پیش
والد
کامیت
bd5bdaef49
2فایلهای تغییر یافته به همراه19 افزوده شده و 1 حذف شده
  1. 16 0
      bash/bash.patch
  2. 3 1
      bash/bash.spec

+ 16 - 0
bash/bash.patch

@@ -111,3 +111,19 @@ Index: version.c
      printf (_("Copyright (C) 2004 Free Software Foundation, Inc.\n"));
  }
 
+-----------------------------------------------------------------------------
+
+Remove dependency to Bison/Yacc by applying a vendor patch to a generated file.
+
+Index: y.tab.c
+--- y.tab.c.orig	2005-11-14 15:53:30 +0100
++++ y.tab.c	2006-03-06 22:46:56 +0100
+@@ -4237,7 +4237,7 @@
+ 	  if (open == ch)	/* undo previous increment */
+ 	    count--;
+ 	  if (ch == '(')		/* ) */
+-	    nestret = parse_matched_pair (0, '(', ')', &nestlen, rflags);
++	    nestret = parse_matched_pair (0, '(', ')', &nestlen, rflags & ~P_DQUOTE);
+ 	  else if (ch == '{')		/* } */
+ 	    nestret = parse_matched_pair (0, '{', '}', &nestlen, P_FIRSTCLOSE|rflags);
+ 	  else if (ch == '[')		/* ] */

+ 3 - 1
bash/bash.spec

@@ -39,7 +39,7 @@ Class:        CORE
 Group:        Shell
 License:      GPL
 Version:      %{V_base_real}.%{V_plvl_raw}
-Release:      20060227
+Release:      20060306
 
 #   list of sources
 Source0:      ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}.tar.gz
@@ -88,6 +88,8 @@ AutoReqProv:  no
     #   unpack and patch distribution
     %setup -q -n bash-%{V_base_real}
     %patch -p0 -P 0 1 2 3 4 5 6 7 8 9 10 11
+    sleep 1
+    touch y.tab.c
 
     #   brand with OpenPKG release and fix patchlevel
     %{l_shtool} subst \