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

Do not let different versions of libstdc++ conflict with each other. At the

Browse Source 
same time, make sure that g++ is never installed alongside a higher version
of libstdc++, so that stuff will always link to the correct library.

feedback espie@ and kurt@, ok kurt@
This commit is contained in:
pascal 2012-05-04 08:47:55 +00:00
parent 15d74a765d
commit 46702013ca
9 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lang/gcc/3.3/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.57 2012/04/24 09:47:31 sthen Exp $
# $OpenBSD: Makefile,v 1.58 2012/05/04 08:47:55 pascal Exp $
ONLY_FOR_ARCHS = alpha amd64 i386 m68k sparc sparc64 powerpc vax
@ -24,8 +24,8 @@ SHARED_LIBS = estdc++ 7.0 \
objc_gc 2.0
REVISION-main = 2
REVISION-c++ = 3
REVISION-estdc = 0
REVISION-c++ = 4
REVISION-estdc = 1
REVISION-g77 = 3
REVISION-java = 3
REVISION-objc = 3

3
lang/gcc/3.3/pkg/PLIST-c++
View File

@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST-c++,v 1.2 2005/09/14 10:41:02 espie Exp $
@comment $OpenBSD: PLIST-c++,v 1.3 2012/05/04 08:47:55 pascal Exp $
@conflict egcs-*-core
@conflict libstdc++->=3.4
@pkgpath lang/egcs/stable,-c++
bin/ec++
bin/eg++

4
lang/gcc/3.3/pkg/PLIST-estdc
View File

@ -1,3 +1,5 @@
@comment $OpenBSD: PLIST-estdc,v 1.2 2005/09/14 10:41:02 espie Exp $
@comment $OpenBSD: PLIST-estdc,v 1.3 2012/05/04 08:47:55 pascal Exp $
@option no-default-conflict
@conflict libstdc++->=3.3,<3.4
@pkgpath lang/egcs/stable,-estdc
%%SHARED%%

6
lang/gcc/4.2/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.76 2012/04/23 14:12:18 pascal Exp $
# $OpenBSD: Makefile,v 1.77 2012/05/04 08:47:55 pascal Exp $
ONLY_FOR_ARCHS = alpha i386 m68k sparc sparc64 powerpc vax amd64
#BROKEN=adjust for types changes
@ -20,8 +20,8 @@ PKGNAME-objc = gobjc-${FULL_PKGVERSION}
PKGNAME-ada = gnat-${FULL_PKGVERSION}
REVISION-main = 8
REVISION-c++ = 11
REVISION-estdc = 1
REVISION-c++ = 12
REVISION-estdc = 2
REVISION-f95 = 10
REVISION-java = 9
REVISION-objc = 9

3
lang/gcc/4.2/pkg/PLIST-c++
View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST-c++,v 1.8 2009/04/16 18:36:48 espie Exp $
@comment $OpenBSD: PLIST-c++,v 1.9 2012/05/04 08:47:55 pascal Exp $
@conflict libstdc++->=4.3
@bin bin/ec++
@bin bin/eg++
@bin bin/${CONFIG}-ec++

4
lang/gcc/4.2/pkg/PLIST-estdc
View File

@ -1,2 +1,4 @@
@comment $OpenBSD: PLIST-estdc,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
@comment $OpenBSD: PLIST-estdc,v 1.2 2012/05/04 08:47:55 pascal Exp $
@option no-default-conflict
@conflict libstdc++->=4.2,<4.3
%%SHARED%%

6
lang/gcc/4.6/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.23 2012/04/23 14:16:34 pascal Exp $
# $OpenBSD: Makefile,v 1.24 2012/05/04 08:47:55 pascal Exp $
ONLY_FOR_ARCHS = amd64 i386 powerpc sparc sparc64
@ -19,8 +19,8 @@ PKGNAME-ada = gnat-${FULL_PKGVERSION}
PKGNAME-go = gccgo-${FULL_PKGVERSION}
REVISION-main = 2
REVISION-c++ = 2
REVISION-estdc = 1
REVISION-c++ = 3
REVISION-estdc = 2
REVISION-f95 = 2
REVISION-java = 2
REVISION-objc = 2

3
lang/gcc/4.6/pkg/PLIST-c++
View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST-c++,v 1.3 2011/11/20 10:32:30 pascal Exp $
@comment $OpenBSD: PLIST-c++,v 1.4 2012/05/04 08:47:55 pascal Exp $
@conflict libstdc++->=4.7
@bin bin/ec++
@bin bin/eg++
@bin bin/${CONFIG}-ec++

4
lang/gcc/4.6/pkg/PLIST-estdc
View File

@ -1,2 +1,4 @@
@comment $OpenBSD: PLIST-estdc,v 1.1.1.1 2011/11/14 13:00:55 pascal Exp $
@comment $OpenBSD: PLIST-estdc,v 1.2 2012/05/04 08:47:55 pascal Exp $
@option no-default-conflict
@conflict libstdc++->=4.6,<4.7
%%SHARED%%