Fix building with GLIBC 2.10+ wrt #272705, thanks to Diego E. Pettenò and Victor Ostorga.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

1 files changed, 93 insertions, 0 deletions

diff --git a/net-misc/omniORB/files/omniORB-4.1.3-glibc-2.10.patch b/net-misc/omniORB/files/omniORB-4.1.3-glibc-2.10.patch
new file mode 100644
index 000000000000..5eb702c9d08d
--- /dev/null
+++ b/net-misc/omniORB/files/omniORB-4.1.3-glibc-2.10.patch
@@ -0,0 +1,93 @@
+diff -NrU5 omniORB-4.1.3.original/src/appl/utils/catior/catior.cc omniORB-4.1.3/src/appl/utils/catior/catior.cc
+--- omniORB-4.1.3.original/src/appl/utils/catior/catior.cc	2009-06-11 15:09:32.000000000 +0000
++++ omniORB-4.1.3/src/appl/utils/catior/catior.cc	2009-06-11 15:20:45.000000000 +0000
+@@ -358,11 +358,11 @@
+ 
+   int c;
+   int hexflag = 0;
+   int omniflag = 0;
+ 
+-  while((c = getopt(argc,argv,"xo")) != EOF) {
++  while((c = getopt(argc,argv,"xo")) != -1) {
+     switch(c) {
+     case 'x':
+       hexflag = 1;
+       break;
+     case 'o':
+diff -NrU5 omniORB-4.1.3.original/src/appl/utils/convertior/convertior.cc omniORB-4.1.3/src/appl/utils/convertior/convertior.cc
+--- omniORB-4.1.3.original/src/appl/utils/convertior/convertior.cc	2009-06-11 15:09:32.000000000 +0000
++++ omniORB-4.1.3/src/appl/utils/convertior/convertior.cc	2009-06-11 15:21:11.000000000 +0000
+@@ -148,11 +148,11 @@
+ 
+   // Get options:
+ 
+   int c;
+ 
+-  while((c = getopt(argc,argv,"x")) != EOF)
++  while((c = getopt(argc,argv,"x")) != -1)
+     {
+       switch(c)
+ 	{
+ 	case '?':
+ 	case 'h':
+diff -NrU5 omniORB-4.1.3.original/src/tool/omkdepend/def.h omniORB-4.1.3/src/tool/omkdepend/def.h
+--- omniORB-4.1.3.original/src/tool/omkdepend/def.h	2009-06-11 15:09:32.000000000 +0000
++++ omniORB-4.1.3/src/tool/omkdepend/def.h	2009-06-11 15:21:34.000000000 +0000
+@@ -126,11 +126,11 @@
+ char			*realloc();
+ #endif
+ 
+ char			*copy();
+ char			*base_name();
+-char			*getline();
++char			*get_line();
+ struct symtab		*slookup();
+ struct symtab		*isdefined();
+ struct symtab		*fdefined();
+ struct filepointer	*getfile();
+ struct inclist		*newinclude();
+diff -NrU5 omniORB-4.1.3.original/src/tool/omkdepend/main.c omniORB-4.1.3/src/tool/omkdepend/main.c
+--- omniORB-4.1.3.original/src/tool/omkdepend/main.c	2009-06-11 15:09:32.000000000 +0000
++++ omniORB-4.1.3/src/tool/omkdepend/main.c	2009-06-11 15:22:23.000000000 +0000
+@@ -467,11 +467,11 @@
+ 
+ /*
+  * Get the next line.  We only return lines beginning with '#' since that
+  * is all this program is ever interested in.
+  */
+-char *getline(filep)
++char *get_line(filep)
+ 	register struct filepointer	*filep;
+ {
+ 	register char	*p,	/* walking pointer */
+ 			*eof,	/* end of file pointer */
+ 			*bol;	/* beginning of line pointer */
+diff -NrU5 omniORB-4.1.3.original/src/tool/omkdepend/parse.c omniORB-4.1.3/src/tool/omkdepend/parse.c
+--- omniORB-4.1.3.original/src/tool/omkdepend/parse.c	2009-06-11 15:09:32.000000000 +0000
++++ omniORB-4.1.3/src/tool/omkdepend/parse.c	2009-06-11 15:23:19.000000000 +0000
+@@ -39,11 +39,11 @@
+ {
+ 	register char	*line;
+ 	register int	type;
+ 	boolean recfailOK;
+ 
+-	while (line = getline(filep)) {
++	while (line = get_line(filep)) {
+ 		switch(type = deftype(line, filep, file_red, file, TRUE)) {
+ 		case IF:
+ 		doif:
+ 			type = find_includes(filep, file,
+ 				file_red, recursion+1, failOK);
+@@ -164,11 +164,11 @@
+ 	struct inclist		*file, *file_red;
+ {
+ 	register char	*line;
+ 	register int	type;
+ 
+-	while (line = getline(filep)) {
++	while (line = get_line(filep)) {
+ 		switch(type = deftype(line, filep, file_red, file, FALSE)) {
+ 		case IF:
+ 		case IFFALSE:
+ 		case IFGUESSFALSE:
+ 		case IFDEF: