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

Sync -pthread semantics with base gcc. From Brad.

Browse Source 
ok matthew@
This commit is contained in:
pascal 2012-08-20 12:35:41 +00:00
parent e051391d3c
commit e27ffe7e0c
8 changed files with 58 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lang/gcc/3.3/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.59 2012/06/21 13:56:57 sthen Exp $
# $OpenBSD: Makefile,v 1.60 2012/08/20 12:35:41 pascal Exp $
ONLY_FOR_ARCHS = alpha amd64 i386 m68k sparc sparc64 powerpc vax
@ -23,13 +23,13 @@ SHARED_LIBS = estdc++ 7.0 \
objc 2.0 \
objc_gc 2.0
REVISION-main = 3
REVISION-c++ = 5
REVISION-main = 4
REVISION-c++ = 6
REVISION-estdc = 2
REVISION-g77 = 4
REVISION-java = 4
REVISION-objc = 4
REVISION-ada = 4
REVISION-g77 = 5
REVISION-java = 5
REVISION-objc = 5
REVISION-ada = 5
EPOCH = 0
MAINTAINER = Marc Espie <espie@openbsd.org>

8
lang/gcc/3.3/patches/patch-gcc_config_openbsd-libpthread_h
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-gcc_config_openbsd-libpthread_h,v 1.1.1.1 2005/01/03 15:21:27 espie Exp $
--- gcc/config/openbsd-libpthread.h.orig Mon Jan 3 10:17:43 2005
+++ gcc/config/openbsd-libpthread.h Mon Jan 3 10:17:43 2005
$OpenBSD: patch-gcc_config_openbsd-libpthread_h,v 1.2 2012/08/20 12:35:41 pascal Exp $
--- gcc/config/openbsd-libpthread.h.orig Thu Aug 16 03:08:41 2012
+++ gcc/config/openbsd-libpthread.h Thu Aug 16 03:09:49 2012
@@ -0,0 +1,23 @@
+/* LIB_SPEC appropriate for OpenBSD. Include -lpthread if -pthread is
+ specified on the command line. */
@ -23,5 +23,5 @@ $OpenBSD: patch-gcc_config_openbsd-libpthread_h,v 1.1.1.1 2005/01/03 15:21:27 es
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA. */
+
+#define OBSD_LIB_SPEC "%{!shared:%{pthread:-lpthread%{p:_p}%{!p:%{pg:_p}}}} %{!shared:-lc%{p:_p}%{!p:%{pg:_p}}}"
+#define OBSD_LIB_SPEC "%{pthread:-lpthread%{!shared:%{p|pg:_p}}} -lc%{!shared:%{p|pg:_p}}"
+

14
lang/gcc/4.2/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.79 2012/06/21 13:56:57 sthen Exp $
# $OpenBSD: Makefile,v 1.80 2012/08/20 12:35:41 pascal Exp $
ONLY_FOR_ARCHS = alpha i386 m68k sparc sparc64 powerpc vax amd64
#BROKEN=adjust for types changes
@ -19,13 +19,13 @@ PKGNAME-java = gcj-${FULL_PKGVERSION}
PKGNAME-objc = gobjc-${FULL_PKGVERSION}
PKGNAME-ada = gnat-${FULL_PKGVERSION}
REVISION-main = 9
REVISION-c++ = 13
REVISION-main = 10
REVISION-c++ = 14
REVISION-estdc = 3
REVISION-f95 = 11
REVISION-java = 11
REVISION-objc = 10
REVISION-ada = 9
REVISION-f95 = 12
REVISION-java = 12
REVISION-objc = 11
REVISION-ada = 10
EPOCH = 0
SHARED_LIBS = estdc++ 13.0 \

8
lang/gcc/4.2/patches/patch-gcc_config_openbsd-libpthread_h
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-gcc_config_openbsd-libpthread_h,v 1.1 2006/10/20 13:43:18 espie Exp $
--- gcc/config/openbsd-libpthread.h.orig Wed Oct 18 13:46:36 2006
+++ gcc/config/openbsd-libpthread.h Wed Oct 18 13:46:50 2006
$OpenBSD: patch-gcc_config_openbsd-libpthread_h,v 1.2 2012/08/20 12:35:41 pascal Exp $
--- gcc/config/openbsd-libpthread.h.orig Thu Aug 16 03:15:26 2012
+++ gcc/config/openbsd-libpthread.h Thu Aug 16 03:16:44 2012
@@ -0,0 +1,23 @@
+/* LIB_SPEC appropriate for OpenBSD. Include -lpthread if -pthread is
+ specified on the command line. */
@ -23,5 +23,5 @@ $OpenBSD: patch-gcc_config_openbsd-libpthread_h,v 1.1 2006/10/20 13:43:18 espie
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA. */
+
+#define OBSD_LIB_SPEC "%{!shared:%{pthread:-lpthread} -lc}"
+#define OBSD_LIB_SPEC "%{pthread:-lpthread%{!shared:%{p|pg:_p}}} -lc%{!shared:%{p|pg:_p}}"
+

16
lang/gcc/4.6/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.28 2012/07/01 18:28:40 pascal Exp $
# $OpenBSD: Makefile,v 1.29 2012/08/20 12:35:41 pascal Exp $
ONLY_FOR_ARCHS = amd64 i386 powerpc sparc sparc64
@ -18,14 +18,14 @@ PKGNAME-objc = gobjc-${FULL_PKGVERSION}
PKGNAME-ada = gnat-${FULL_PKGVERSION}
PKGNAME-go = gccgo-${FULL_PKGVERSION}
REVISION-main = 3
REVISION-c++ = 6
REVISION-main = 4
REVISION-c++ = 7
REVISION-estdc = 3
REVISION-f95 = 3
REVISION-java = 4
REVISION-objc = 3
REVISION-ada = 3
REVISION-go = 3
REVISION-f95 = 4
REVISION-java = 5
REVISION-objc = 4
REVISION-ada = 4
REVISION-go = 4
SHARED_LIBS = estdc++ 14.0 \
gfortran 3.0 \

10
lang/gcc/4.6/patches/patch-gcc_config_openbsd-libpthread_h Normal file
View File

@ -0,0 +1,10 @@
$OpenBSD: patch-gcc_config_openbsd-libpthread_h,v 1.3 2012/08/20 12:35:41 pascal Exp $
--- gcc/config/openbsd-libpthread.h.orig Thu Aug 16 03:22:15 2012
+++ gcc/config/openbsd-libpthread.h Thu Aug 16 03:22:55 2012
@@ -18,5 +18,5 @@
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define OBSD_LIB_SPEC "%{!shared:%{pthread:-lpthread} -lc}"
+#define OBSD_LIB_SPEC "%{pthread:-lpthread%{!shared:%{p|pg:_p}}} -lc%{!shared:%{p|pg:_p}}"

9
lang/gcc/4.7/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.9 2012/07/15 08:56:26 pascal Exp $
# $OpenBSD: Makefile,v 1.10 2012/08/20 12:35:41 pascal Exp $
ONLY_FOR_ARCHS = amd64 i386 powerpc sparc sparc64
@ -21,6 +21,13 @@ PKGNAME-ada = gnat-${FULL_PKGVERSION}
#PKGNAME-go = gccgo-${FULL_PKGVERSION}
PKGSPEC-main = gcc->=4.7,<4.8
REVISION-main = 0
REVISION-c++ = 0
REVISION-estdc = 0
REVISION-f95 = 0
REVISION-objc = 0
REVISION-ada = 0
SHARED_LIBS = estdc++ 15.0 \
gfortran 4.0 \
gcj 2.0 \

10
lang/gcc/4.7/patches/patch-gcc_config_openbsd-libpthread_h Normal file
View File

@ -0,0 +1,10 @@
$OpenBSD: patch-gcc_config_openbsd-libpthread_h,v 1.1 2012/08/20 12:35:41 pascal Exp $
--- gcc/config/openbsd-libpthread.h.orig Thu Aug 16 03:30:37 2012
+++ gcc/config/openbsd-libpthread.h Thu Aug 16 03:30:49 2012
@@ -18,5 +18,5 @@
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define OBSD_LIB_SPEC "%{!shared:%{pthread:-lpthread} -lc}"
+#define OBSD_LIB_SPEC "%{pthread:-lpthread%{!shared:%{p|pg:_p}}} -lc%{!shared:%{p|pg:_p}}"