| 1 |
ssuominen 09/06/20 15:37:09 |
| 2 |
|
| 3 |
Added: omniORB-4.1.3-glibc-2.10.patch |
| 4 |
Log: |
| 5 |
Fix building with GLIBC 2.10+ wrt #272705, thanks to Diego E. Pettenò and Victor Ostorga. |
| 6 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 net-misc/omniORB/files/omniORB-4.1.3-glibc-2.10.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/omniORB/files/omniORB-4.1.3-glibc-2.10.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/omniORB/files/omniORB-4.1.3-glibc-2.10.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: omniORB-4.1.3-glibc-2.10.patch |
| 15 |
=================================================================== |
| 16 |
diff -NrU5 omniORB-4.1.3.original/src/appl/utils/catior/catior.cc omniORB-4.1.3/src/appl/utils/catior/catior.cc |
| 17 |
--- omniORB-4.1.3.original/src/appl/utils/catior/catior.cc 2009-06-11 15:09:32.000000000 +0000 |
| 18 |
+++ omniORB-4.1.3/src/appl/utils/catior/catior.cc 2009-06-11 15:20:45.000000000 +0000 |
| 19 |
@@ -358,11 +358,11 @@ |
| 20 |
|
| 21 |
int c; |
| 22 |
int hexflag = 0; |
| 23 |
int omniflag = 0; |
| 24 |
|
| 25 |
- while((c = getopt(argc,argv,"xo")) != EOF) { |
| 26 |
+ while((c = getopt(argc,argv,"xo")) != -1) { |
| 27 |
switch(c) { |
| 28 |
case 'x': |
| 29 |
hexflag = 1; |
| 30 |
break; |
| 31 |
case 'o': |
| 32 |
diff -NrU5 omniORB-4.1.3.original/src/appl/utils/convertior/convertior.cc omniORB-4.1.3/src/appl/utils/convertior/convertior.cc |
| 33 |
--- omniORB-4.1.3.original/src/appl/utils/convertior/convertior.cc 2009-06-11 15:09:32.000000000 +0000 |
| 34 |
+++ omniORB-4.1.3/src/appl/utils/convertior/convertior.cc 2009-06-11 15:21:11.000000000 +0000 |
| 35 |
@@ -148,11 +148,11 @@ |
| 36 |
|
| 37 |
// Get options: |
| 38 |
|
| 39 |
int c; |
| 40 |
|
| 41 |
- while((c = getopt(argc,argv,"x")) != EOF) |
| 42 |
+ while((c = getopt(argc,argv,"x")) != -1) |
| 43 |
{ |
| 44 |
switch(c) |
| 45 |
{ |
| 46 |
case '?': |
| 47 |
case 'h': |
| 48 |
diff -NrU5 omniORB-4.1.3.original/src/tool/omkdepend/def.h omniORB-4.1.3/src/tool/omkdepend/def.h |
| 49 |
--- omniORB-4.1.3.original/src/tool/omkdepend/def.h 2009-06-11 15:09:32.000000000 +0000 |
| 50 |
+++ omniORB-4.1.3/src/tool/omkdepend/def.h 2009-06-11 15:21:34.000000000 +0000 |
| 51 |
@@ -126,11 +126,11 @@ |
| 52 |
char *realloc(); |
| 53 |
#endif |
| 54 |
|
| 55 |
char *copy(); |
| 56 |
char *base_name(); |
| 57 |
-char *getline(); |
| 58 |
+char *get_line(); |
| 59 |
struct symtab *slookup(); |
| 60 |
struct symtab *isdefined(); |
| 61 |
struct symtab *fdefined(); |
| 62 |
struct filepointer *getfile(); |
| 63 |
struct inclist *newinclude(); |
| 64 |
diff -NrU5 omniORB-4.1.3.original/src/tool/omkdepend/main.c omniORB-4.1.3/src/tool/omkdepend/main.c |
| 65 |
--- omniORB-4.1.3.original/src/tool/omkdepend/main.c 2009-06-11 15:09:32.000000000 +0000 |
| 66 |
+++ omniORB-4.1.3/src/tool/omkdepend/main.c 2009-06-11 15:22:23.000000000 +0000 |
| 67 |
@@ -467,11 +467,11 @@ |
| 68 |
|
| 69 |
/* |
| 70 |
* Get the next line. We only return lines beginning with '#' since that |
| 71 |
* is all this program is ever interested in. |
| 72 |
*/ |
| 73 |
-char *getline(filep) |
| 74 |
+char *get_line(filep) |
| 75 |
register struct filepointer *filep; |
| 76 |
{ |
| 77 |
register char *p, /* walking pointer */ |
| 78 |
*eof, /* end of file pointer */ |
| 79 |
*bol; /* beginning of line pointer */ |
| 80 |
diff -NrU5 omniORB-4.1.3.original/src/tool/omkdepend/parse.c omniORB-4.1.3/src/tool/omkdepend/parse.c |
| 81 |
--- omniORB-4.1.3.original/src/tool/omkdepend/parse.c 2009-06-11 15:09:32.000000000 +0000 |
| 82 |
+++ omniORB-4.1.3/src/tool/omkdepend/parse.c 2009-06-11 15:23:19.000000000 +0000 |
| 83 |
@@ -39,11 +39,11 @@ |
| 84 |
{ |
| 85 |
register char *line; |
| 86 |
register int type; |
| 87 |
boolean recfailOK; |
| 88 |
|
| 89 |
- while (line = getline(filep)) { |
| 90 |
+ while (line = get_line(filep)) { |
| 91 |
switch(type = deftype(line, filep, file_red, file, TRUE)) { |
| 92 |
case IF: |
| 93 |
doif: |
| 94 |
type = find_includes(filep, file, |
| 95 |
file_red, recursion+1, failOK); |
| 96 |
@@ -164,11 +164,11 @@ |
| 97 |
struct inclist *file, *file_red; |
| 98 |
{ |
| 99 |
register char *line; |
| 100 |
register int type; |
| 101 |
|
| 102 |
- while (line = getline(filep)) { |
| 103 |
+ while (line = get_line(filep)) { |
| 104 |
switch(type = deftype(line, filep, file_red, file, FALSE)) { |
| 105 |
case IF: |
| 106 |
case IFFALSE: |
| 107 |
case IFGUESSFALSE: |
| 108 |
case IFDEF: |
Archives