Thu Apr 30 18:19:29 2009 UTC ()
* Update to a refresh snapshot.
* Use gmake as building with bmake fails randomly.
* Make it build on DragonFly master.


(hasso)
diff -r1.1.1.1 -r1.2 pkgsrc/lang/pcc-current/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/lang/pcc-current/distinfo
diff -r0 -r1.1 pkgsrc/lang/pcc-current/patches/patch-aa
cvs diff -r1.1.1.1 -r1.2 pkgsrc/lang/pcc-current/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/pcc-current/Makefile 2008/03/02 12:13:38 1.1.1.1
+++ pkgsrc/lang/pcc-current/Makefile 2009/04/30 18:19:28 1.2
@@ -1,20 +1,22 @@ @@ -1,20 +1,22 @@
1# $NetBSD: Makefile,v 1.1.1.1 2008/03/02 12:13:38 he Exp $ 1# $NetBSD: Makefile,v 1.2 2009/04/30 18:19:28 hasso Exp $
2 2
3DISTNAME= pcc-${DATE_STR} 3DISTNAME= pcc-${DATE_STR}
4PKGNAME= pcc-current-0.9.9.20${DATE_STR} 4PKGNAME= pcc-current-0.9.9.20${DATE_STR}
5DATE_STR= 080223 5DATE_STR= 090430
6CATEGORIES= lang 6CATEGORIES= lang
7MASTER_SITES= ftp://pcc.ludd.ltu.se/pub/pcc/ 7MASTER_SITES= ftp://pcc.ludd.ltu.se/pub/pcc/
8EXTRACT_SUFX= .tgz 8EXTRACT_SUFX= .tgz
9 9
10MAINTAINER= he@NetBSD.org 10MAINTAINER= he@NetBSD.org
11HOMEPAGE= http://pcc.ludd.ltu.se/ 11HOMEPAGE= http://pcc.ludd.ltu.se/
12COMMENT= Portable C compiler 12COMMENT= Portable C compiler
13 13
14CONFLICTS= pcc-[0-9]* 14CONFLICTS= pcc-[0-9]*
15 15
16USE_TOOLS+= lex yacc 16USE_TOOLS+= lex yacc
 17# XXX For some reason building with bmake fails randomly.
 18USE_TOOLS+= gmake
17GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
18MAKE_JOBS_SAFE= no 20MAKE_JOBS_SAFE= no
19 21
20.include "../../mk/bsd.pkg.mk" 22.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/lang/pcc-current/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/pcc-current/distinfo 2008/03/02 12:13:38 1.1.1.1
+++ pkgsrc/lang/pcc-current/distinfo 2009/04/30 18:19:28 1.2
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.1.1.1 2008/03/02 12:13:38 he Exp $ 1$NetBSD: distinfo,v 1.2 2009/04/30 18:19:28 hasso Exp $
2 2
3SHA1 (pcc-080223.tgz) = dd95cd4efaeca4f8fa9123f8b7473e0562c98416 3SHA1 (pcc-090430.tgz) = a0a304749d224253df64a6da6f0d6a8db3ea5ddb
4RMD160 (pcc-080223.tgz) = d9c495e1a9664a60c08538448ed074019a936a0f 4RMD160 (pcc-090430.tgz) = 987f06e0ce5be4bf7ec6113b79502639e8cd6815
5Size (pcc-080223.tgz) = 432942 bytes 5Size (pcc-090430.tgz) = 613292 bytes
 6SHA1 (patch-aa) = 3ca9662e342d240f2d896e95a65261e7e76cda79
File Added: pkgsrc/lang/pcc-current/patches/Attic/patch-aa
$NetBSD: patch-aa,v 1.1 2009/04/30 18:19:28 hasso Exp $

--- os/dragonfly/ccconfig.h.orig	2008-06-03 08:58:22 +0300
+++ os/dragonfly/ccconfig.h	2009-04-30 15:37:16 +0300
@@ -31,14 +31,26 @@
  * Various settings that controls how the C compiler works.
  */
 
+#include <sys/param.h>
+
 /* common cpp predefines */
 #define	CPPADD	{ "-D__DragonFly__", "-D__ELF__", NULL, }
 #define	DYNLINKER { "-dynamic-linker", "/usr/libexec/ld-elf.so.2", NULL }
+
+#if __DragonFly_version < 200202
 #define CRT0FILE "/usr/lib/gcc34/crt1.o"
 #define CRT0FILE_PROFILE "/usr/lib/gcc34/gcrt1.o"
 #define STARTFILES { "/usr/lib/gcc34/crti.o", "/usr/lib/gcc34/crtbegin.o", NULL }
 #define LIBCLIBS { "-lc", "-L/usr/lib/gcc34", "-lgcc", NULL }
 #define	ENDFILES { "/usr/lib/gcc34/crtend.o", "/usr/lib/gcc34/crtn.o", NULL }
+#else
+#define	CRT0FILE "/usr/lib/crt1.o"
+#define	CRT0FILE_PROFILE "/usr/lib/gcrt1.o"
+#define	STARTFILES { "/usr/lib/crti.o", "/usr/lib/gcc41/crtbegin.o", NULL }
+#define	LIBCLIBS { "-lc", "-L/usr/lib/gcc41", "-lgcc", NULL }
+#define	ENDFILES { "/usr/lib/gcc41/crtend.o", "/usr/lib/crtn.o", NULL }
+#endif
+
 #define STARTLABEL "_start"
 
 #if defined(mach_i386)