cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

synch with recent changes in src.

Browse Source 
mostly from brad@
This commit is contained in:
espie 2011-11-16 12:32:49 +00:00
parent 8a612a2089
commit de328a0db8
9 changed files with 28 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lang/gcc/4.2/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.66 2011/10/04 07:08:54 espie Exp $
# $OpenBSD: Makefile,v 1.67 2011/11/16 12:32:49 espie Exp $
ONLY_FOR_ARCHS = alpha i386 m68k sparc sparc64 powerpc vax amd64
#BROKEN=adjust for types changes
@ -18,15 +18,16 @@ PKGNAME-java = gcj-${FULL_PKGVERSION}
PKGNAME-objc = gobjc-${FULL_PKGVERSION}
PKGNAME-ada = gnat-${FULL_PKGVERSION}
REVISION-main = 4
REVISION-c++ = 7
REVISION-main = 5
REVISION-c++ = 8
REVISION-estdc = 0
REVISION-f95 = 7
REVISION-java = 5
REVISION-objc = 6
REVISION-ada = 6
EPOCH = 0
SHARED_LIBS = estdc++ 11.0 \
SHARED_LIBS = estdc++ 13.0 \
gfortran 2.0 \
-org-w3c-dom 1.0 \
-org-xml-sax 1.0 \

11
lang/gcc/4.2/patches/patch-gcc_config_i386_openbsd64_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gcc_config_i386_openbsd64_h,v 1.2 2011/02/08 09:37:51 espie Exp $
--- gcc/config/i386/openbsd64.h.orig Mon Feb 7 12:33:51 2011
+++ gcc/config/i386/openbsd64.h Mon Feb 7 16:45:56 2011
@@ -0,0 +1,124 @@
$OpenBSD: patch-gcc_config_i386_openbsd64_h,v 1.3 2011/11/16 12:32:49 espie Exp $
--- gcc/config/i386/openbsd64.h.orig Wed Oct 19 09:50:28 2011
+++ gcc/config/i386/openbsd64.h Wed Oct 19 09:53:59 2011
@@ -0,0 +1,121 @@
+/* Configuration for an OpenBSD x86-64 target.
+
+ Copyright (C) 2003 Free Software Foundation, Inc.
@ -123,6 +123,3 @@ $OpenBSD: patch-gcc_config_i386_openbsd64_h,v 1.2 2011/02/08 09:37:51 espie Exp
+
+#undef JUMP_TABLES_IN_TEXT_SECTION
+#define JUMP_TABLES_IN_TEXT_SECTION (flag_pic)
+
+/* Define this for chromium. */
+#define HANDLE_PRAGMA_PACK_PUSH_POP 1

21
lang/gcc/4.2/patches/patch-gcc_config_i386_openbsdelf_h
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-gcc_config_i386_openbsdelf_h,v 1.3 2011/02/08 09:37:51 espie Exp $
--- gcc/config/i386/openbsdelf.h.orig Sat Sep 1 17:28:30 2007
+++ gcc/config/i386/openbsdelf.h Mon Feb 7 16:45:06 2011
$OpenBSD: patch-gcc_config_i386_openbsdelf_h,v 1.4 2011/11/16 12:32:49 espie Exp $
--- gcc/config/i386/openbsdelf.h.orig Sat Sep 1 11:28:30 2007
+++ gcc/config/i386/openbsdelf.h Wed Oct 19 09:54:14 2011
@@ -55,10 +55,10 @@ along with GCC; see the file COPYING3. If not see
/* This must agree with <machine/ansi.h> */
@ -14,20 +14,13 @@ $OpenBSD: patch-gcc_config_i386_openbsdelf_h,v 1.3 2011/02/08 09:37:51 espie Exp
#undef WCHAR_TYPE
#define WCHAR_TYPE "int"
@@ -110,9 +110,6 @@ along with GCC; see the file COPYING3. If not see
@@ -109,9 +109,6 @@ along with GCC; see the file COPYING3. If not see
fputs (flag_pic ? "\tcall __mcount@PLT\n": "\tcall __mcount\n", FILE);
/* Assembler format: exception region output. */
-
-/* our configuration still doesn't handle dwarf2 correctly */
-#define DWARF2_UNWIND_INFO 0
-
/* Assembler format: alignment output. */
/* Note that we pick up ASM_OUTPUT_MAX_SKIP_ALIGN from i386/gas.h */
@@ -129,3 +126,6 @@ along with GCC; see the file COPYING3. If not see
%{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}"
#define OBSD_HAS_CORRECT_SPECS
+
+/* Define this for chromium. */
+#define HANDLE_PRAGMA_PACK_PUSH_POP 1

16
lang/gcc/4.2/patches/patch-gcc_config_openbsd_h
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-gcc_config_openbsd_h,v 1.2 2009/04/16 18:36:48 espie Exp $
--- gcc/config/openbsd.h.orig Sat Sep 1 17:28:30 2007
+++ gcc/config/openbsd.h Sat Apr 11 14:22:00 2009
$OpenBSD: patch-gcc_config_openbsd_h,v 1.3 2011/11/16 12:32:49 espie Exp $
--- gcc/config/openbsd.h.orig Sat Sep 1 11:28:30 2007
+++ gcc/config/openbsd.h Wed Oct 19 09:53:01 2011
@@ -72,6 +72,37 @@ along with GCC; see the file COPYING3. If not see
/* Controlling the compilation driver. */
@ -69,7 +69,7 @@ $OpenBSD: patch-gcc_config_openbsd_h,v 1.2 2009/04/16 18:36:48 espie Exp $
#undef LIB_SPEC
#define LIB_SPEC OBSD_LIB_SPEC
#endif
@@ -281,10 +309,6 @@ do { \
@@ -281,15 +309,14 @@ do { \
/* Storage layout. */
@ -80,3 +80,11 @@ $OpenBSD: patch-gcc_config_openbsd_h,v 1.2 2009/04/16 18:36:48 espie Exp $
/* bug work around: we don't want to support #pragma weak, but the current
code layout needs HANDLE_PRAGMA_WEAK asserted for __attribute((weak)) to
work. On the other hand, we don't define HANDLE_PRAGMA_WEAK directly,
as this depends on a few other details as well... */
#define HANDLE_SYSV_PRAGMA 1
+
+/* Define this so we can compile MS code for use with WINE. */
+#define HANDLE_PRAGMA_PACK_PUSH_POP
/* Stack is explicitly denied execution rights on OpenBSD platforms. */
#define ENABLE_EXECUTE_STACK \

20
lang/gcc/4.2/patches/patch-libstdc++-v3_config_locale_generic_time_members_cc
View File

@ -1,20 +0,0 @@
$OpenBSD: patch-libstdc++-v3_config_locale_generic_time_members_cc,v 1.1 2009/06/07 01:22:05 robert Exp $
--- libstdc++-v3/config/locale/generic/time_members.cc.orig Fri Jun 5 05:43:54 2009
+++ libstdc++-v3/config/locale/generic/time_members.cc Fri Jun 5 05:44:13 2009
@@ -128,12 +128,16 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
{
char* __old = strdup(setlocale(LC_ALL, NULL));
setlocale(LC_ALL, _M_name_timepunct);
+#if !defined(__OpenBSD__)
const size_t __len = wcsftime(__s, __maxlen, __format, __tm);
+#endif
setlocale(LC_ALL, __old);
free(__old);
+#if !defined(__OpenBSD__)
// Make sure __s is null terminated.
if (__len == 0)
__s[0] = L'\0';
+#endif
}
template<>

46
lang/gcc/4.2/patches/patch-libstdc++-v3_include_c_compatibility_wchar_h
View File

@ -1,46 +0,0 @@
$OpenBSD: patch-libstdc++-v3_include_c_compatibility_wchar_h,v 1.1 2009/06/07 01:22:05 robert Exp $
--- libstdc++-v3/include/c_compatibility/wchar.h.orig Fri Jun 5 00:05:31 2009
+++ libstdc++-v3/include/c_compatibility/wchar.h Fri Jun 5 00:06:50 2009
@@ -45,24 +45,32 @@ using std::fgetws;
using std::fputwc;
using std::fputws;
using std::fwide;
+#if !defined(__OpenBSD__)
using std::fwprintf;
using std::fwscanf;
using std::swprintf;
using std::swscanf;
using std::vfwprintf;
+#endif
#if _GLIBCXX_HAVE_VFWSCANF
using std::vfwscanf;
#endif
+#if !defined(__OpenBSD__)
using std::vswprintf;
+#endif
#if _GLIBCXX_HAVE_VSWSCANF
using std::vswscanf;
#endif
+#if !defined(__OpenBSD__)
using std::vwprintf;
+#endif
#if _GLIBCXX_HAVE_VWSCANF
using std::vwscanf;
#endif
+#if !defined(__OpenBSD__)
using std::wprintf;
using std::wscanf;
+#endif
using std::getwc;
using std::getwchar;
using std::mbsinit;
@@ -101,7 +109,9 @@ using std::wmemcmp;
using std::wmemcpy;
using std::wmemmove;
using std::wmemset;
+#if !defined(__OpenBSD__)
using std::wcsftime;
+#endif
#if _GLIBCXX_USE_C99
using std::wcstold;

62
lang/gcc/4.2/patches/patch-libstdc++-v3_include_c_std_std_cwchar_h
View File

@ -1,62 +0,0 @@
$OpenBSD: patch-libstdc++-v3_include_c_std_std_cwchar_h,v 1.1 2009/06/07 01:22:05 robert Exp $
--- libstdc++-v3/include/c_std/std_cwchar.h.orig Fri Jun 5 00:00:55 2009
+++ libstdc++-v3/include/c_std/std_cwchar.h Fri Jun 5 00:05:00 2009
@@ -151,8 +151,10 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
using ::fputwc;
using ::fputws;
using ::fwide;
+#if !defined(__OpenBSD__)
using ::fwprintf;
using ::fwscanf;
+#endif
using ::getwc;
using ::getwchar;
using ::mbrlen;
@@ -161,18 +163,26 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
using ::mbsrtowcs;
using ::putwc;
using ::putwchar;
+#if !defined(__OpenBSD__)
using ::swprintf;
using ::swscanf;
+#endif
using ::ungetwc;
+#if !defined(__OpenBSD__)
using ::vfwprintf;
+#endif
#if _GLIBCXX_HAVE_VFWSCANF
using ::vfwscanf;
#endif
+#if !defined(__OpenBSD__)
using ::vswprintf;
+#endif
#if _GLIBCXX_HAVE_VSWSCANF
using ::vswscanf;
#endif
+#if !defined(__OpenBSD__)
using ::vwprintf;
+#endif
#if _GLIBCXX_HAVE_VWSCANF
using ::vwscanf;
#endif
@@ -182,7 +192,9 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
using ::wcscoll;
using ::wcscpy;
using ::wcscspn;
+#if !defined(__OpenBSD__)
using ::wcsftime;
+#endif
using ::wcslen;
using ::wcsncat;
using ::wcsncmp;
@@ -202,8 +214,10 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
using ::wmemcpy;
using ::wmemmove;
using ::wmemset;
+#if !defined(__OpenBSD__)
using ::wprintf;
using ::wscanf;
+#endif
using ::wcschr;

19
lang/gcc/4.2/patches/patch-libstdc++-v3_include_c_std_std_cwctype_h
View File

@ -1,19 +0,0 @@
$OpenBSD: patch-libstdc++-v3_include_c_std_std_cwctype_h,v 1.1 2009/06/07 01:22:05 robert Exp $
--- libstdc++-v3/include/c_std/std_cwctype.h.orig Fri Jun 5 00:07:56 2009
+++ libstdc++-v3/include/c_std/std_cwctype.h Fri Jun 5 00:09:22 2009
@@ -81,6 +81,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
using ::wint_t; // cwchar
+#if !defined(__OpenBSD__)
using ::wctype_t;
using ::wctrans_t;
@@ -104,6 +105,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
using ::towupper;
using ::wctrans;
using ::wctype;
+#endif
_GLIBCXX_END_NAMESPACE

12
lang/gcc/4.2/patches/patch-libstdc++-v3_include_tr1_cwctype
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-libstdc++-v3_include_tr1_cwctype,v 1.1 2009/06/07 01:22:05 robert Exp $
--- libstdc++-v3/include/tr1/cwctype.orig Fri Jun 5 02:00:32 2009
+++ libstdc++-v3/include/tr1/cwctype Fri Jun 5 02:01:17 2009
@@ -45,7 +45,7 @@ namespace std
{
_GLIBCXX_BEGIN_NAMESPACE(tr1)
-#if _GLIBCXX_HAVE_ISWBLANK
+#if defined(_GLIBCXX_HAVE_ISWBLANK) && !defined(__OpenBSD__)
using std::iswblank;
#endif