Fix building with glibc 2.10 , bug #278075

Package-Manager: portage-2.1.6.13/cvs/Linux i686

1 files changed, 32 insertions, 0 deletions

diff --git a/dev-util/intel2gas/files/intel2gas-1.3.3-glibc210.patch b/dev-util/intel2gas/files/intel2gas-1.3.3-glibc210.patch
new file mode 100644
index 000000000000..1a79a84c5461
--- /dev/null
+++ b/dev-util/intel2gas/files/intel2gas-1.3.3-glibc210.patch
@@ -0,0 +1,32 @@
+diff -NrU5 intel2gas-1.3.3.original/intel2gas.cc intel2gas-1.3.3/intel2gas.cc
+--- intel2gas-1.3.3.original/intel2gas.cc	2009-08-09 15:36:40.000000000 -0600
++++ intel2gas-1.3.3/intel2gas.cc	2009-08-09 15:44:33.000000000 -0600
+@@ -440,11 +440,11 @@
+ 
+ static void findComment(char const *source, comment_match_t &match)
+ {
+   match.at = NULL;
+   for (int c=0; c<comments; c++) {
+-    char *pos = strstr(source, comment[c].src);
++    char *pos = const_cast<char*>(strstr(source, comment[c].src));
+     if (!match.at || (pos && pos < match.at)) {
+       match.at = pos;
+       match.data = &comment[c];
+     }
+   }
+diff -NrU5 intel2gas-1.3.3.original/strhandle.cc intel2gas-1.3.3/strhandle.cc
+--- intel2gas-1.3.3.original/strhandle.cc	2009-08-09 15:36:40.000000000 -0600
++++ intel2gas-1.3.3/strhandle.cc	2009-08-09 15:41:14.000000000 -0600
+@@ -22,11 +22,11 @@
+ 
+ 
+ /* Like str_cutat, but the beginning of str is copied to buffer at left */
+ char *str_splitat(char const * const str, char *left, char cut)
+ {
+-    char *pos = strchr(str,cut);
++    char *pos = const_cast<char*>(strchr(str,cut));
+     if (!pos) {
+         strcpy(left,str);
+         return NULL;
+     }
+     strncpy(left,str,pos-str);