summaryrefslogtreecommitdiff
path: root/editors/openoffice.org-1.0/files/patch-external+glibc+glibcpatch
blob: 07e2f5373ee8d88c88167e00359c291b2c1f7cc0 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
--- /dev/null	Sun Jun  2 16:11:00 2002
+++ ../external/glibc/flist.pat	Sun Jun  2 12:00:09 2002
@@ -0,0 +1 @@
+patch-getopt.h
--- /dev/null	Sun Jun  2 16:11:00 2002
+++ ../external/glibc/patch-getopt.h	Sun Jun  2 16:14:52 2002
@@ -0,0 +1,14 @@
+--- rtufiles/getopt.h.orig	Fri May 31 16:46:21 2002
++++ rtufiles/getopt.h	Fri May 31 17:07:19 2002
+@@ -133,7 +133,11 @@
+    errors, only prototype getopt for the GNU C library.  */
+ extern int getopt (int __argc, char *const *__argv, const char *__shortopts);
+ # else /* not __GNU_LIBRARY__ */
++#if (__GNUC__ == 3 && defined(FREEBSD))
++/* skip getopt() definition , it conflicts with std.h */
++#else
+ extern int getopt ();
++# endif /* FREEBSD */
+ # endif /* __GNU_LIBRARY__ */
+ 
+ # ifndef __need_getopt
--- ../external/glibc/glibcpatch.sh.orig	Sun Jun  2 11:46:42 2002
+++ ../external/glibc/glibcpatch.sh	Sun Jun  2 16:13:51 2002
@@ -113,7 +113,10 @@
 # apply the patches
 #
 
-# there is no need to apply patch here
+for PNAME in `cat flist.pat`
+  do
+      patch < $PNAME
+  done
 
 
 #