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

Don't hardcode GC_nprocs to 1 in boehm-gc, but get it from sysconf instead,

Browse Source 
following a similar change in devel/boehm-gc.
From Brad.

ok kurt@
This commit is contained in:
pascal 2012-05-07 10:34:33 +00:00
parent fe539d183c
commit 21fda32a64
6 changed files with 41 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lang/gcc/4.2/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.77 2012/05/04 08:47:55 pascal Exp $
# $OpenBSD: Makefile,v 1.78 2012/05/07 10:34:33 pascal Exp $
ONLY_FOR_ARCHS = alpha i386 m68k sparc sparc64 powerpc vax amd64
#BROKEN=adjust for types changes
@ -23,7 +23,7 @@ REVISION-main = 8
REVISION-c++ = 12
REVISION-estdc = 2
REVISION-f95 = 10
REVISION-java = 9
REVISION-java = 10
REVISION-objc = 9
REVISION-ada = 8
EPOCH = 0

23
lang/gcc/4.2/patches/patch-boehm-gc_pthread_support_c
View File

@ -1,17 +1,16 @@
$OpenBSD: patch-boehm-gc_pthread_support_c,v 1.1 2009/06/04 18:24:20 kurt Exp $
$OpenBSD: patch-boehm-gc_pthread_support_c,v 1.2 2012/05/07 10:34:33 pascal Exp $
--- boehm-gc/pthread_support.c.orig Sat Oct 13 11:01:29 2007
+++ boehm-gc/pthread_support.c Tue Apr 21 17:22:05 2009
@@ -892,6 +892,9 @@ void GC_thr_init()
GC_nprocs = sysconf(_SC_NPROC_ONLN);
if (GC_nprocs <= 0) GC_nprocs = 1;
+++ boehm-gc/pthread_support.c Tue May 1 03:54:08 2012
@@ -884,7 +884,7 @@ void GC_thr_init()
GC_nprocs = pthread_num_processors_np();
# endif
+# if defined(GC_OPENBSD_THREADS)
+ GC_nprocs = 1;
+# endif
# if defined(GC_DARWIN_THREADS) || defined(GC_FREEBSD_THREADS)
int ncpus = 1;
size_t len = sizeof(ncpus);
@@ -966,7 +969,7 @@ void GC_init_parallel()
# if defined(GC_OSF1_THREADS) || defined(GC_AIX_THREADS) \
- || defined(GC_SOLARIS_PTHREADS)
+ || defined(GC_SOLARIS_PTHREADS) || defined(GC_OPENBSD_THREADS)
GC_nprocs = sysconf(_SC_NPROCESSORS_ONLN);
if (GC_nprocs <= 0) GC_nprocs = 1;
# endif
@@ -966,7 +966,7 @@ void GC_init_parallel()
}

4
lang/gcc/4.6/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.24 2012/05/04 08:47:55 pascal Exp $
# $OpenBSD: Makefile,v 1.25 2012/05/07 10:34:33 pascal Exp $
ONLY_FOR_ARCHS = amd64 i386 powerpc sparc sparc64
@ -22,7 +22,7 @@ REVISION-main = 2
REVISION-c++ = 3
REVISION-estdc = 2
REVISION-f95 = 2
REVISION-java = 2
REVISION-java = 3
REVISION-objc = 2
REVISION-ada = 2
REVISION-go = 2

25
lang/gcc/4.6/patches/patch-boehm-gc_pthread_support_c
View File

@ -1,17 +1,16 @@
$OpenBSD: patch-boehm-gc_pthread_support_c,v 1.1.1.1 2011/11/14 13:00:57 pascal Exp $
--- boehm-gc/pthread_support.c.orig Sat Nov 12 10:42:07 2011
+++ boehm-gc/pthread_support.c Sat Nov 12 10:44:30 2011
@@ -892,6 +892,9 @@ void GC_thr_init()
GC_nprocs = sysconf(_SC_NPROC_ONLN);
if (GC_nprocs <= 0) GC_nprocs = 1;
$OpenBSD: patch-boehm-gc_pthread_support_c,v 1.2 2012/05/07 10:34:33 pascal Exp $
--- boehm-gc/pthread_support.c.orig Fri Dec 10 05:09:10 2010
+++ boehm-gc/pthread_support.c Tue May 1 03:40:41 2012
@@ -884,7 +884,7 @@ void GC_thr_init()
GC_nprocs = pthread_num_processors_np();
# endif
+# if defined(GC_OPENBSD_THREADS)
+ GC_nprocs = 1;
+# endif
# if defined(GC_DARWIN_THREADS) || defined(GC_FREEBSD_THREADS)
int ncpus = 1;
size_t len = sizeof(ncpus);
@@ -966,7 +969,7 @@ void GC_init_parallel()
# if defined(GC_OSF1_THREADS) || defined(GC_AIX_THREADS) \
- || defined(GC_SOLARIS_PTHREADS)
+ || defined(GC_SOLARIS_PTHREADS) || defined(GC_OPENBSD_THREADS)
GC_nprocs = sysconf(_SC_NPROCESSORS_ONLN);
if (GC_nprocs <= 0) GC_nprocs = 1;
# endif
@@ -966,7 +966,7 @@ void GC_init_parallel()
}

4
lang/gcc/4.7/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.5 2012/05/03 11:49:14 espie Exp $
# $OpenBSD: Makefile,v 1.6 2012/05/07 10:34:33 pascal Exp $
ONLY_FOR_ARCHS = amd64 i386 hppa powerpc sparc sparc64
@ -20,7 +20,7 @@ PKGNAME-ada = gnat-${FULL_PKGVERSION}
#PKGNAME-go = gccgo-${FULL_PKGVERSION}
REVISION = 0
REVISION-c++ = 1
REVISION-java = 1
REVISION-java = 2
PKGSPEC-main = gcc->=4.7,<4.8
SHARED_LIBS = estdc++ 15.0 \

25
lang/gcc/4.7/patches/patch-boehm-gc_pthread_support_c
View File

@ -1,17 +1,16 @@
$OpenBSD: patch-boehm-gc_pthread_support_c,v 1.1.1.1 2012/04/23 15:56:41 pascal Exp $
--- boehm-gc/pthread_support.c.orig Sat Nov 12 10:42:07 2011
+++ boehm-gc/pthread_support.c Sat Nov 12 10:44:30 2011
@@ -892,6 +892,9 @@ void GC_thr_init()
GC_nprocs = sysconf(_SC_NPROC_ONLN);
if (GC_nprocs <= 0) GC_nprocs = 1;
$OpenBSD: patch-boehm-gc_pthread_support_c,v 1.2 2012/05/07 10:34:33 pascal Exp $
--- boehm-gc/pthread_support.c.orig Fri Dec 10 05:09:10 2010
+++ boehm-gc/pthread_support.c Tue May 1 03:49:56 2012
@@ -884,7 +884,7 @@ void GC_thr_init()
GC_nprocs = pthread_num_processors_np();
# endif
+# if defined(GC_OPENBSD_THREADS)
+ GC_nprocs = 1;
+# endif
# if defined(GC_DARWIN_THREADS) || defined(GC_FREEBSD_THREADS)
int ncpus = 1;
size_t len = sizeof(ncpus);
@@ -966,7 +969,7 @@ void GC_init_parallel()
# if defined(GC_OSF1_THREADS) || defined(GC_AIX_THREADS) \
- || defined(GC_SOLARIS_PTHREADS)
+ || defined(GC_SOLARIS_PTHREADS) || defined(GC_OPENBSD_THREADS)
GC_nprocs = sysconf(_SC_NPROCESSORS_ONLN);
if (GC_nprocs <= 0) GC_nprocs = 1;
# endif
@@ -966,7 +966,7 @@ void GC_init_parallel()
}