diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2002-06-02 19:29:04 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2002-06-02 19:29:04 +0000 |
| commit | 954b175db3ad7f8dff62efe885605807c76f75bc (patch) | |
| tree | a16395754ce46d96992679e845dcea1ade04b6fc /editors/openoffice-1.0/files | |
| parent | Same case as Solaris. (diff) | |
Add a patch to not prototype getopt() again if gcc3 is used.
Notes
Notes:
svn path=/head/; revision=60486
Diffstat (limited to 'editors/openoffice-1.0/files')
| -rw-r--r-- | editors/openoffice-1.0/files/patch-external+glibc+glibcpatch | 35 | ||||
| -rw-r--r-- | editors/openoffice-1.0/files/patch-external::glibc::glibcpatch | 35 |
2 files changed, 70 insertions, 0 deletions
diff --git a/editors/openoffice-1.0/files/patch-external+glibc+glibcpatch b/editors/openoffice-1.0/files/patch-external+glibc+glibcpatch new file mode 100644 index 000000000000..07e2f5373ee8 --- /dev/null +++ b/editors/openoffice-1.0/files/patch-external+glibc+glibcpatch @@ -0,0 +1,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 + + + # diff --git a/editors/openoffice-1.0/files/patch-external::glibc::glibcpatch b/editors/openoffice-1.0/files/patch-external::glibc::glibcpatch new file mode 100644 index 000000000000..07e2f5373ee8 --- /dev/null +++ b/editors/openoffice-1.0/files/patch-external::glibc::glibcpatch @@ -0,0 +1,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 + + + # |