Attachment #42991 for bug #66896

View | Details | Raw Unified | Return to bug 66896
Collapse All | Expand All





PORTNAME=	crossgo32
PORTVERSION=	1.3
PORTREVISION=	2
CATEGORIES=	devel
MASTER_SITES=	${MASTER_SITE_LOCAL} \
		ftp://sources.redhat.com/pub/crossgcc/

GO32DIR=	${PREFIX}/share/crossgo32

.include <bsd.port.pre.mk>

.if ${OSVERSION} >= 500113
BROKEN=		"Does not compile"
.endif

post-extract:
	${MV} ${WRKDIR}/dosrel-1.0/ ${WRKSRC}




--- gcc/cccp.c.old	Wed May 19 15:10:39 2004
+++ gcc/cccp.c	Wed May 19 15:19:53 2004
@@ -24,6 +24,8 @@
 
 typedef unsigned char U_CHAR;
 
+#define HAS_STDARG_H
+
 #ifdef EMACS
 #define NO_SHORTNAMES
 #include "../src/config.h"
@@ -199,7 +201,7 @@
 # endif
 #endif
 
-#if defined (__STDC__) && defined (HAVE_VPRINTF)
+#if defined (__STDC__) && defined (HAVE_VPRINTF) || defined (HAS_STDARG_H)
 # include <stdarg.h>
 # define VA_START(va_list, var) va_start (va_list, var)
 # define PRINTF_ALIST(msg) char *msg, ...
@@ -8967,7 +8969,7 @@
 }
 
 static void
-#if defined (__STDC__) && defined (HAVE_VPRINTF)
+#if defined (__STDC__) && defined (HAVE_VPRINTF) || defined (HAS_STDARG_H)
 error_with_line (int line, PRINTF_ALIST (msg))
 #else
 error_with_line (line, PRINTF_ALIST (msg))
@@ -9007,7 +9009,7 @@
 }
 
 static void
-#if defined (__STDC__) && defined (HAVE_VPRINTF)
+#if defined (__STDC__) && defined (HAVE_VPRINTF) || defined (HAS_STDARG_H)
 warning_with_line (int line, PRINTF_ALIST (msg))
 #else
 warning_with_line (line, PRINTF_ALIST (msg))
@@ -9069,7 +9071,7 @@
 }
 
 void
-#if defined (__STDC__) && defined (HAVE_VPRINTF)
+#if defined (__STDC__) && defined (HAVE_VPRINTF) || defined (HAS_STDARG_H)
 pedwarn_with_line (int line, PRINTF_ALIST (msg))
 #else
 pedwarn_with_line (line, PRINTF_ALIST (msg))
@@ -9091,7 +9093,7 @@
    giving specified file name and line number, not current.  */
 
 static void
-#if defined (__STDC__) && defined (HAVE_VPRINTF)
+#if defined (__STDC__) && defined (HAVE_VPRINTF) || defined (HAS_STDARG_H)
 pedwarn_with_file_and_line (char *file, int line, PRINTF_ALIST (msg))
 #else
 pedwarn_with_file_and_line (file, line, PRINTF_ALIST (msg))




--- libiberty/functions.def.old	Thu Jul  4 19:16:36 1996
+++ libiberty/functions.def	Wed May 19 18:21:14 2004
@@ -34,15 +34,12 @@
 DEF(strchr, char*, (s, c), CONST char *s AND int c)
 DEF(strdup, char*, (s1), char * s1)
 DEF(strrchr, char*, (s, c), CONST char *s AND int c)
-DEF(strstr, char*, (), NOTHING)
 DEF(strtod, double, (), NOTHING)
 DEF(strtol, long, (), NOTHING)
 DEF(strtoul, unsigned long, (), NOTHING)
 DEF(tmpnam, char *, (s), char * s)
 DEF(vfork, int, (), NOTHING)
 DEF(vfprintf, int, (), NOTHING)
-DEF(vprintf, int, (), NOTHING)
-DEF(vsprintf, int, (), NOTHING)
 DEF(sigsetmask, int, (), NOTHING)
 DEF(alloca, PTR, (size), size_t size)
 DEF(waitpid, int, (pid, statp, opts), int pid AND int* statp AND int opts )

Line 0 Link Here

(-)crossgo32.new/files/patch-g++.c (+10 lines)
	1	--- gcc/cp/g++.c.old Wed May 19 15:33:04 2004
	2	+++ gcc/cp/g++.c Wed May 19 15:33:19 2004
	3	@@ -92,7 +92,6 @@
	4	extern int errno;
	5	#endif
	6
	7	-extern int sys_nerr;
	8	#ifndef HAVE_STRERROR
	9	#if defined(bsd4_4)
	10	extern const char *const sys_errlist[];

Line 0 Link Here

(-)crossgo32.new/files/patch-gcc.c (+10 lines)
	1	--- gcc/gcc.c.old Wed May 19 15:29:39 2004
	2	+++ gcc/gcc.c Wed May 19 15:29:46 2004
	3	@@ -175,7 +175,6 @@
	4	extern int errno;
	5	#endif
	6
	7	-extern int sys_nerr;
	8	#ifndef HAVE_STRERROR
	9	#if defined(bsd4_4)
	10	extern const char *const sys_errlist[];




--- gcc/protoize.c.orig	Mon Oct  9 18:37:32 1995
+++ gcc/protoize.c	Wed May 19 16:16:12 2004
@@ -22,6 +22,8 @@
    as __STDC__ plus more, so make sure that __STDC__ is defined if
    __cplusplus is defined. */
 
+#define HAS_STDARG_H
+
 #if defined(__cplusplus) && !defined(__STDC__)
 #define __STDC__ 1
 #endif /* defined(__cplusplus) && !defined(__STDC__) */
@@ -57,7 +59,9 @@
 #define _POSIX_SOURCE
 #endif
 
+#ifndef HAS_STDARG_H
 #include <varargs.h>
+#endif
 /* On some systems stdio.h includes stdarg.h;
    we must bring in varargs.h first.  */
 #include <stdio.h>
@@ -66,7 +70,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #ifndef _WIN32
-#if defined(POSIX) || defined(CONCURRENT)
+#if defined(POSIX) || defined(CONCURRENT) || defined (HAS_STDARG_H)
 #include <dirent.h>
 #else
 #include <sys/dir.h>

Line 0 Link Here

(-)crossgo32.new/files/patch-strerror.c (+10 lines)
	1	--- libiberty/strerror.c.old Wed May 19 15:01:49 2004
	2	+++ libiberty/strerror.c Wed May 19 15:01:55 2004
	3	@@ -460,7 +460,6 @@
	4
	5	#else
	6
	7	-extern int sys_nerr;
	8	extern char *sys_errlist[];
	9
	10	#endif

Line 0 Link Here

(-)crossgo32.new/files/patch-strsignal.c (+10 lines)
	1	--- libiberty/strsignal.c.old Wed May 19 15:05:20 2004
	2	+++ libiberty/strsignal.c Wed May 19 15:05:32 2004
	3	@@ -235,7 +235,6 @@
	4
	5	#else
	6
	7	-static int sys_nsig = NSIG;
	8	extern const char * const sys_siglist[];
	9
	10	#endif

Return to bug 66896

Lines 9-15 Link Here

(-)crossgo32.new/Makefile (-5 / +1 lines)
9		9
10	PORTNAME= crossgo32	10	PORTNAME= crossgo32
11	PORTVERSION= 1.3	11	PORTVERSION= 1.3
12	PORTREVISION= 1	12	PORTREVISION= 2
13	CATEGORIES= devel	13	CATEGORIES= devel
14	MASTER_SITES= ${MASTER_SITE_LOCAL} \	14	MASTER_SITES= ${MASTER_SITE_LOCAL} \
15	ftp://sources.redhat.com/pub/crossgcc/	15	ftp://sources.redhat.com/pub/crossgcc/
Lines 36-45 Link Here
36	GO32DIR= ${PREFIX}/share/crossgo32	36	GO32DIR= ${PREFIX}/share/crossgo32
37		37
38	.include <bsd.port.pre.mk>	38	.include <bsd.port.pre.mk>
39
40	.if ${OSVERSION} >= 500113
41	BROKEN= "Does not compile"
42	.endif
43		39
44	post-extract:	40	post-extract:
45	${MV} ${WRKDIR}/dosrel-1.0/ ${WRKSRC}	41	${MV} ${WRKDIR}/dosrel-1.0/ ${WRKSRC}

Line 0 Link Here

(-)crossgo32.new/files/patch-cccp.c (+56 lines)
	1	--- gcc/cccp.c.old Wed May 19 15:10:39 2004
	2	+++ gcc/cccp.c Wed May 19 15:19:53 2004
	3	@@ -24,6 +24,8 @@
	4
	5	typedef unsigned char U_CHAR;
	6
	7	+#define HAS_STDARG_H
	8	+
	9	#ifdef EMACS
	10	#define NO_SHORTNAMES
	11	#include "../src/config.h"
	12	@@ -199,7 +201,7 @@
	13	# endif
	14	#endif
	15
	16	-#if defined (__STDC__) && defined (HAVE_VPRINTF)
	17	+#if defined (__STDC__) && defined (HAVE_VPRINTF) \|\| defined (HAS_STDARG_H)
	18	# include <stdarg.h>
	19	# define VA_START(va_list, var) va_start (va_list, var)
	20	# define PRINTF_ALIST(msg) char *msg, ...
	21	@@ -8967,7 +8969,7 @@
	22	}
	23
	24	static void
	25	-#if defined (__STDC__) && defined (HAVE_VPRINTF)
	26	+#if defined (__STDC__) && defined (HAVE_VPRINTF) \|\| defined (HAS_STDARG_H)
	27	error_with_line (int line, PRINTF_ALIST (msg))
	28	#else
	29	error_with_line (line, PRINTF_ALIST (msg))
	30	@@ -9007,7 +9009,7 @@
	31	}
	32
	33	static void
	34	-#if defined (__STDC__) && defined (HAVE_VPRINTF)
	35	+#if defined (__STDC__) && defined (HAVE_VPRINTF) \|\| defined (HAS_STDARG_H)
	36	warning_with_line (int line, PRINTF_ALIST (msg))
	37	#else
	38	warning_with_line (line, PRINTF_ALIST (msg))
	39	@@ -9069,7 +9071,7 @@
	40	}
	41
	42	void
	43	-#if defined (__STDC__) && defined (HAVE_VPRINTF)
	44	+#if defined (__STDC__) && defined (HAVE_VPRINTF) \|\| defined (HAS_STDARG_H)
	45	pedwarn_with_line (int line, PRINTF_ALIST (msg))
	46	#else
	47	pedwarn_with_line (line, PRINTF_ALIST (msg))
	48	@@ -9091,7 +9093,7 @@
	49	giving specified file name and line number, not current. */
	50
	51	static void
	52	-#if defined (__STDC__) && defined (HAVE_VPRINTF)
	53	+#if defined (__STDC__) && defined (HAVE_VPRINTF) \|\| defined (HAS_STDARG_H)
	54	pedwarn_with_file_and_line (char *file, int line, PRINTF_ALIST (msg))
	55	#else
	56	pedwarn_with_file_and_line (file, line, PRINTF_ALIST (msg))

Line 0 Link Here

(-)crossgo32.new/files/patch-functions.def (+18 lines)
	1	--- libiberty/functions.def.old Thu Jul 4 19:16:36 1996
	2	+++ libiberty/functions.def Wed May 19 18:21:14 2004
	3	@@ -34,15 +34,12 @@
	4	DEF(strchr, char, (s, c), CONST char s AND int c)
	5	DEF(strdup, char, (s1), char s1)
	6	DEF(strrchr, char, (s, c), CONST char s AND int c)
	7	-DEF(strstr, char*, (), NOTHING)
	8	DEF(strtod, double, (), NOTHING)
	9	DEF(strtol, long, (), NOTHING)
	10	DEF(strtoul, unsigned long, (), NOTHING)
	11	DEF(tmpnam, char , (s), char s)
	12	DEF(vfork, int, (), NOTHING)
	13	DEF(vfprintf, int, (), NOTHING)
	14	-DEF(vprintf, int, (), NOTHING)
	15	-DEF(vsprintf, int, (), NOTHING)
	16	DEF(sigsetmask, int, (), NOTHING)
	17	DEF(alloca, PTR, (size), size_t size)
	18	DEF(waitpid, int, (pid, statp, opts), int pid AND int* statp AND int opts )

Line 0 Link Here

(-)crossgo32.new/files/patch-protoize.c (+30 lines)
	1	--- gcc/protoize.c.orig Mon Oct 9 18:37:32 1995
	2	+++ gcc/protoize.c Wed May 19 16:16:12 2004
	3	@@ -22,6 +22,8 @@
	4	as __STDC__ plus more, so make sure that __STDC__ is defined if
	5	__cplusplus is defined. */
	6
	7	+#define HAS_STDARG_H
	8	+
	9	#if defined(__cplusplus) && !defined(__STDC__)
	10	#define __STDC__ 1
	11	#endif /* defined(__cplusplus) && !defined(__STDC__) */
	12	@@ -57,7 +59,9 @@
	13	#define _POSIX_SOURCE
	14	#endif
	15
	16	+#ifndef HAS_STDARG_H
	17	#include <varargs.h>
	18	+#endif
	19	/* On some systems stdio.h includes stdarg.h;
	20	we must bring in varargs.h first. */
	21	#include <stdio.h>
	22	@@ -66,7 +70,7 @@
	23	#include <sys/types.h>
	24	#include <sys/stat.h>
	25	#ifndef _WIN32
	26	-#if defined(POSIX) \|\| defined(CONCURRENT)
	27	+#if defined(POSIX) \|\| defined(CONCURRENT) \|\| defined (HAS_STDARG_H)
	28	#include <dirent.h>
	29	#else
	30	#include <sys/dir.h>