[csw-devel] SF.net SVN: gar:[7891] csw/mgar/pkg/bash/trunk

[chninkel at users.sourceforge.net]

Revision: 7891
          http://gar.svn.sourceforge.net/gar/?rev=7891&view=rev
Author:   chninkel
Date:     2010-01-06 15:00:16 +0000 (Wed, 06 Jan 2010)

Log Message:
-----------
bash: fixed a compilation error caused by vsnprintf redefinition

Modified Paths:
--------------
    csw/mgar/pkg/bash/trunk/Makefile
    csw/mgar/pkg/bash/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/bash/trunk/files/vsnprintf.patch

Modified: csw/mgar/pkg/bash/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bash/trunk/Makefile	2010-01-06 12:51:41 UTC (rev 7890)
+++ csw/mgar/pkg/bash/trunk/Makefile	2010-01-06 15:00:16 UTC (rev 7891)
@@ -67,6 +67,8 @@
 # opencsw bash use /etc/bash.bashrc and /etc/bash.bash_logout files
 PATCHFILES += use_system_bashrc_and_logout.patch
 
+# Temporary fix for vsnprintf definition clash
+PATCHFILES += vsnprintf.patch
 
 ##### Build and installation information #####
 

Modified: csw/mgar/pkg/bash/trunk/checksums
===================================================================
--- csw/mgar/pkg/bash/trunk/checksums	2010-01-06 12:51:41 UTC (rev 7890)
+++ csw/mgar/pkg/bash/trunk/checksums	2010-01-06 15:00:16 UTC (rev 7891)
@@ -3,3 +3,4 @@
 8b104a3cddca41849186af53c8602eef  changelog.CSW
 60956e6be20f69dafbb06fcc83bab88e  shells
 29607316cff22f7427322d8f190cbadf  use_system_bashrc_and_logout.patch
+f2876ca41b05f236621abddc713af3e7  vsnprintf.patch

Added: csw/mgar/pkg/bash/trunk/files/vsnprintf.patch
===================================================================
--- csw/mgar/pkg/bash/trunk/files/vsnprintf.patch	                        (rev 0)
+++ csw/mgar/pkg/bash/trunk/files/vsnprintf.patch	2010-01-06 15:00:16 UTC (rev 7891)
@@ -0,0 +1,47 @@
+diff --speed-large-files -Nur builtins/printf.def builtins/printf.def
+--- builtins/printf.def	2010-01-06 15:15:00.498275417 +0100
++++ builtins/printf.def	2010-01-06 15:13:39.646642489 +0100
+@@ -172,7 +172,9 @@
+ #endif
+ 
+ #if !HAVE_VSNPRINTF
+-extern int vsnprintf __P((char *, size_t, const char *, ...)) __attribute__((__format__ (printf, 3, 4)));
++extern int bash_vsnprintf __P((char *, size_t, const char *, ...)) __attribute__((__format__ (printf, 3, 4)));
++#else
++#  define bash_vsnprintf vsnprintf
+ #endif
+ 
+ static void printf_erange __P((char *));
+@@ -885,7 +887,7 @@
+   int blen;
+ 
+   SH_VA_START (args, format);
+-  blen = vsnprintf (vbuf + vblen, vbsize - vblen, format, args);
++  blen = bash_vsnprintf (vbuf + vblen, vbsize - vblen, format, args);
+   va_end (args);
+ 
+   nlen = vblen + blen + 1;
+@@ -894,7 +896,7 @@
+       vbsize = ((nlen + 63) >> 6) << 6;
+       vbuf = (char *)xrealloc (vbuf, vbsize);
+       SH_VA_START (args, format);
+-      blen = vsnprintf (vbuf + vblen, vbsize - vblen, format, args);
++      blen = bash_vsnprintf (vbuf + vblen, vbsize - vblen, format, args);
+       va_end (args);
+     }
+ 
+diff --speed-large-files -Nur lib/sh/snprintf.c lib/sh/snprintf.c
+--- lib/sh/snprintf.c	2010-01-06 15:14:47.740952207 +0100
++++ lib/sh/snprintf.c	2010-01-06 15:14:25.727971179 +0100
+@@ -1655,9 +1655,9 @@
+ 
+ int
+ #if defined (__STDC__)
+-vsnprintf(char *string, size_t length, const char *format, va_list args)
++bash_vsnprintf(char *string, size_t length, const char *format, va_list args)
+ #else
+-vsnprintf(string, length, format, args)
++bash_vsnprintf(string, length, format, args)
+      char *string;
+      size_t length;
+      const char *format;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.