Split libestdc into a separate package so we can add a dependency
for ports built with g++-3. From pvalchev@ and yours truly; ok pvalchev@
This commit is contained in:
parent
b95d7ecb1a
commit
22478210d4
@ -1,4 +1,4 @@
|
|||||||
# $OpenBSD: Makefile,v 1.67 2002/09/28 19:19:51 brad Exp $
|
# $OpenBSD: Makefile,v 1.68 2002/09/30 20:52:45 naddy Exp $
|
||||||
|
|
||||||
ONLY_FOR_ARCHS= alpha i386 m68k sparc sparc64 powerpc
|
ONLY_FOR_ARCHS= alpha i386 m68k sparc sparc64 powerpc
|
||||||
|
|
||||||
@ -20,6 +20,7 @@ MAKE_ADA=No
|
|||||||
COM= 'GNU compiler collection'
|
COM= 'GNU compiler collection'
|
||||||
COMMENT= ${COM}: core C compiler
|
COMMENT= ${COM}: core C compiler
|
||||||
COMMENT-c++ = ${COM}: C++ compiler
|
COMMENT-c++ = ${COM}: C++ compiler
|
||||||
|
COMMENT-estdc= ${COM}: C++ compiler library
|
||||||
COMMENT-chill= ${COM}: Chill compiler
|
COMMENT-chill= ${COM}: Chill compiler
|
||||||
COMMENT-g77= ${COM}: f77 compiler
|
COMMENT-g77= ${COM}: f77 compiler
|
||||||
COMMENT-java= ${COM}: java compiler
|
COMMENT-java= ${COM}: java compiler
|
||||||
@ -28,6 +29,7 @@ COMMENT-ada= ${COM}: Ada compiler
|
|||||||
|
|
||||||
PKGNAME= gcc-$V
|
PKGNAME= gcc-$V
|
||||||
PKGNAME-c++ = g++-$V
|
PKGNAME-c++ = g++-$V
|
||||||
|
PKGNAME-estdc = libestdc-$V
|
||||||
PKGNAME-chill= gchill-$V
|
PKGNAME-chill= gchill-$V
|
||||||
PKGNAME-g77= g77-$V
|
PKGNAME-g77= g77-$V
|
||||||
PKGNAME-java= gcj-$V
|
PKGNAME-java= gcj-$V
|
||||||
@ -40,7 +42,6 @@ BUILD_DEPENDS= ::devel/autoconf
|
|||||||
BUILD_DEPENDS+= :bison-*:devel/bison
|
BUILD_DEPENDS+= :bison-*:devel/bison
|
||||||
|
|
||||||
CATEGORIES= lang
|
CATEGORIES= lang
|
||||||
NEED_VERSION= 1.474
|
|
||||||
MAINTAINER= Marc Espie <espie@openbsd.org>
|
MAINTAINER= Marc Espie <espie@openbsd.org>
|
||||||
|
|
||||||
|
|
||||||
@ -177,7 +178,7 @@ MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/gcc
|
|||||||
LANGS=c
|
LANGS=c
|
||||||
.if defined(MAKE_GXX) && ${MAKE_GXX:L} == "yes"
|
.if defined(MAKE_GXX) && ${MAKE_GXX:L} == "yes"
|
||||||
LANGS:=${LANGS},c++
|
LANGS:=${LANGS},c++
|
||||||
MULTI_PACKAGES+=-c++
|
MULTI_PACKAGES+=-c++ -estdc
|
||||||
.endif
|
.endif
|
||||||
.if defined(MAKE_FORTRAN) && ${MAKE_FORTRAN:L} == "yes"
|
.if defined(MAKE_FORTRAN) && ${MAKE_FORTRAN:L} == "yes"
|
||||||
LANGS:=${LANGS},f77
|
LANGS:=${LANGS},f77
|
||||||
@ -288,7 +289,7 @@ post-install:
|
|||||||
|
|
||||||
REGRESS_DEPENDS+=::lang/egcs/stable
|
REGRESS_DEPENDS+=::lang/egcs/stable
|
||||||
.if defined(MAKE_GXX) && ${MAKE_GXX:L} == "yes"
|
.if defined(MAKE_GXX) && ${MAKE_GXX:L} == "yes"
|
||||||
REGRESS_DEPENDS+=::lang/egcs/stable,-c++
|
REGRESS_DEPENDS+=::lang/egcs/stable,-c++,-estdc
|
||||||
.endif
|
.endif
|
||||||
.if defined(MAKE_FORTRAN) && ${MAKE_FORTRAN:L} == "yes"
|
.if defined(MAKE_FORTRAN) && ${MAKE_FORTRAN:L} == "yes"
|
||||||
REGRESS_DEPENDS+=::lang/egcs/stable,-g77
|
REGRESS_DEPENDS+=::lang/egcs/stable,-g77
|
||||||
@ -324,9 +325,12 @@ SED_PLIST=|sed -e '/^IFPIC:/d'
|
|||||||
GCC_NAME=${WRKBUILD}/gcc/xgcc
|
GCC_NAME=${WRKBUILD}/gcc/xgcc
|
||||||
|
|
||||||
.if defined(PACKAGING) && defined(SUBPACKAGE)
|
.if defined(PACKAGING) && defined(SUBPACKAGE)
|
||||||
. if !empty(SUBPACKAGE)
|
. if !empty(SUBPACKAGE) && ${SUBPACKAGE} != "-estdc"
|
||||||
RUN_DEPENDS+=::lang/egcs/stable
|
RUN_DEPENDS+=::lang/egcs/stable
|
||||||
. endif
|
. endif
|
||||||
|
. if ${SUBPACKAGE} == "-c++"
|
||||||
|
RUN_DEPENDS+=::lang/egcs/stable,-estdc
|
||||||
|
. endif
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
CONFIG=${MACHINE_ARCH}-unknown-openbsd${OSREV}
|
CONFIG=${MACHINE_ARCH}-unknown-openbsd${OSREV}
|
||||||
|
@ -1,2 +0,0 @@
|
|||||||
@comment $OpenBSD: PFRAG.shared-c++,v 1.5 2002/09/14 10:14:51 espie Exp $
|
|
||||||
lib/libestdc++.so.5.0
|
|
1
lang/egcs/stable/pkg/PFRAG.shared-estdc
Normal file
1
lang/egcs/stable/pkg/PFRAG.shared-estdc
Normal file
@ -0,0 +1 @@
|
|||||||
|
lib/libestdc++.so.5.0
|
@ -1,4 +1,4 @@
|
|||||||
@comment $OpenBSD: PLIST-c++,v 1.9 2002/09/14 10:14:51 espie Exp $
|
@comment $OpenBSD: PLIST-c++,v 1.10 2002/09/30 20:52:45 naddy Exp $
|
||||||
@pkgcfl egcs-*-core
|
@pkgcfl egcs-*-core
|
||||||
bin/ec++
|
bin/ec++
|
||||||
bin/ec++filt
|
bin/ec++filt
|
||||||
@ -200,7 +200,6 @@ lib/libestdc++.la
|
|||||||
lib/libsupc++.a
|
lib/libsupc++.a
|
||||||
lib/libsupc++.la
|
lib/libsupc++.la
|
||||||
man/man1/eg++.1
|
man/man1/eg++.1
|
||||||
%%SHARED%%
|
|
||||||
@dirrm include/c++/${V}/${CONFIG}/bits
|
@dirrm include/c++/${V}/${CONFIG}/bits
|
||||||
@dirrm include/c++/${V}/${CONFIG}
|
@dirrm include/c++/${V}/${CONFIG}
|
||||||
@dirrm include/c++/${V}/ext
|
@dirrm include/c++/${V}/ext
|
||||||
|
2
lang/egcs/stable/pkg/PLIST-estdc
Normal file
2
lang/egcs/stable/pkg/PLIST-estdc
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
@comment $OpenBSD: PLIST-estdc,v 1.1 2002/09/30 20:52:45 naddy Exp $
|
||||||
|
%%SHARED%%
|
Loading…
Reference in New Issue
Block a user