OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 09-Jan-2003 20:52:03
Branch: HEAD Handle: 2003010919520101
Modified files:
openpkg-src/gcc gcc.patch gcc.spec
openpkg-web news.txt
Log:
Include official patch for FreeBSD 5 from gcc.gnu.org CVS repository:
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/ginclude/stddef.h.diff?r1=1.15&r2=1.16
This fixes building under latest FreeBSD 5.0-CURRENT.
Summary:
Revision Changes Path
1.2 +108 -0 openpkg-src/gcc/gcc.patch
1.42 +1 -1 openpkg-src/gcc/gcc.spec
1.2626 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gcc/gcc.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 gcc.patch
--- openpkg-src/gcc/gcc.patch 28 Jun 2002 18:30:15 -0000 1.1
+++ openpkg-src/gcc/gcc.patch 9 Jan 2003 19:52:02 -0000 1.2
@@ -9,3 +9,111 @@
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
# contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+--- gcc/gcc/ginclude/stddef.h 2002/08/02 06:09:14 1.15
++++ gcc/gcc/ginclude/stddef.h 2002/10/04 21:16:05 1.16
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 1989, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
++/* Copyright (C) 1989, 1997, 1998, 1999, 2000, 2002 Free Software Foundation, Inc.
+
+ This file is part of GNU CC.
+
+@@ -53,9 +53,13 @@
+
+ /* On 4.3bsd-net2, make sure ansi.h is included, so we have
+ one less case to deal with in the following. */
+-#if defined (__BSD_NET2__) || defined (____386BSD____) || defined (__FreeBSD__) ||
defined(__NetBSD__)
++#if defined (__BSD_NET2__) || defined (____386BSD____) || (defined (__FreeBSD__)
&& (__FreeBSD__ < 5)) || defined(__NetBSD__)
+ #include <machine/ansi.h>
+ #endif
++/* On FreeBSD 5, machine/ansi.h does not exist anymore... */
++#if defined (__FreeBSD__) && (__FreeBSD__ >= 5)
++#include <sys/_types.h>
++#endif
+
+ /* In 4.3bsd-net2, machine/ansi.h defines these symbols, which are
+ defined if the corresponding type is *not* defined.
+@@ -176,6 +180,7 @@
+ #ifndef _SIZE_T_DEFINED_
+ #ifndef _SIZE_T_DEFINED
+ #ifndef _BSD_SIZE_T_DEFINED_ /* Darwin */
++#ifndef _SIZE_T_DECLARED /* FreeBSD 5 */
+ #ifndef ___int_size_t_h
+ #ifndef _GCC_SIZE_T
+ #ifndef _SIZET_
+@@ -192,10 +197,15 @@
+ #define _SIZE_T_DEFINED_
+ #define _SIZE_T_DEFINED
+ #define _BSD_SIZE_T_DEFINED_ /* Darwin */
++#define _SIZE_T_DECLARED /* FreeBSD 5 */
+ #define ___int_size_t_h
+ #define _GCC_SIZE_T
+ #define _SIZET_
++#if defined (__FreeBSD__) && (__FreeBSD__ >= 5)
++/* __size_t is a typedef on FreeBSD 5!, must not trash it. */
++#else
+ #define __size_t
++#endif
+ #ifndef __SIZE_TYPE__
+ #define __SIZE_TYPE__ long unsigned int
+ #endif
+@@ -209,6 +219,7 @@
+ #endif /* _SIZET_ */
+ #endif /* _GCC_SIZE_T */
+ #endif /* ___int_size_t_h */
++#endif /* _SIZE_T_DECLARED */
+ #endif /* _BSD_SIZE_T_DEFINED_ */
+ #endif /* _SIZE_T_DEFINED */
+ #endif /* _SIZE_T_DEFINED_ */
+@@ -243,6 +254,7 @@
+ #ifndef _BSD_WCHAR_T_
+ #ifndef _BSD_WCHAR_T_DEFINED_ /* Darwin */
+ #ifndef _BSD_RUNE_T_DEFINED_ /* Darwin */
++#ifndef _WCHAR_T_DECLARED /* FreeBSD 5 */
+ #ifndef _WCHAR_T_DEFINED_
+ #ifndef _WCHAR_T_DEFINED
+ #ifndef _WCHAR_T_H
+@@ -263,6 +275,7 @@
+ #define ___int_wchar_t_h
+ #define __INT_WCHAR_T_H
+ #define _GCC_WCHAR_T
++#define _WCHAR_T_DECLARED
+
+ /* On BSD/386 1.1, at least, machine/ansi.h defines _BSD_WCHAR_T_
+ instead of _WCHAR_T_, and _BSD_RUNE_T_ (which, unlike the other
+@@ -281,7 +294,7 @@
+ typedef _BSD_RUNE_T_ rune_t;
+ #define _BSD_WCHAR_T_DEFINED_
+ #define _BSD_RUNE_T_DEFINED_ /* Darwin */
+-#if defined (__FreeBSD__)
++#if defined (__FreeBSD__) && (__FreeBSD__ < 5)
+ /* Why is this file so hard to maintain properly? In constrast to
+ the comment above regarding BSD/386 1.1, on FreeBSD for as long
+ as the symbol has existed, _BSD_RUNE_T_ must not stay defined or
+@@ -291,6 +304,19 @@
+ #endif
+ #endif
+ #endif
++/* FreeBSD 5 can't be handled well using "traditional" logic above
++ since it no longer defines _BSD_RUNE_T_ yet still desires to export
++ rune_t in some cases... */
++#if defined (__FreeBSD__) && (__FreeBSD__ >= 5)
++#if !defined (_ANSI_SOURCE) && !defined (_POSIX_SOURCE)
++#if __BSD_VISIBLE
++#ifndef _RUNE_T_DECLARED
++typedef __rune_t rune_t;
++#define _RUNE_T_DECLARED
++#endif
++#endif
++#endif
++#endif
+
+ #ifndef __WCHAR_TYPE__
+ #define __WCHAR_TYPE__ int
+@@ -304,6 +330,7 @@
+ #endif
+ #endif
+ #endif
++#endif /* _WCHAR_T_DECLARED */
+ #endif /* _BSD_RUNE_T_DEFINED_ */
+ #endif
+ #endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gcc/gcc.spec
============================================================================
$ cvs diff -u -r1.41 -r1.42 gcc.spec
--- openpkg-src/gcc/gcc.spec 3 Jan 2003 11:26:19 -0000 1.41
+++ openpkg-src/gcc/gcc.spec 9 Jan 2003 19:52:02 -0000 1.42
@@ -38,7 +38,7 @@
Group: Language
License: GPL
Version: %{V_short}
-Release: 20030103
+Release: 20030109
# package options
%option with_cxx yes
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.2625 -r1.2626 news.txt
--- openpkg-web/news.txt 9 Jan 2003 16:50:32 -0000 1.2625
+++ openpkg-web/news.txt 9 Jan 2003 19:52:01 -0000 1.2626
@@ -1,3 +1,4 @@
+09-Jan-2003: Upgraded package: P<gcc-3.2.1-20030109>
09-Jan-2003: Upgraded package: P<mysql-3.23.54a-20030109>
09-Jan-2003: Upgraded package: P<openpkg-tool-20030109-20030109>
09-Jan-2003: Upgraded package: P<make-3.80-20030109>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
