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

move tests to the post-install stage, to grab the right flavor of

Browse Source 
libstdc++.

Adjust PLIST for the right libstdc++ version.
This commit is contained in:
espie 1999-03-25 21:51:27 +00:00
parent 504c3973e6
commit 6008fc7b62
4 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lang/egcs-stable/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.18 1999/03/21 07:51:08 espie Exp $
# $OpenBSD: Makefile,v 1.19 1999/03/25 21:51:27 espie Exp $
# This is a configuration file for egcs, stable release.
@ -159,6 +159,9 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \
CONFIGURE_ARGS+=${CONFIGURE_SHARED}
# Not really stable yet
# CONFIGURE_ARGS+= --enable-threads=yes
SEPARATE_BUILD=simple
# rebuild configure files after patching, then move source around !!!
@ -177,19 +180,24 @@ pre-configure:
# use bootstrap-lean if you're pressed for space
ALL_TARGET=bootstrap
# ALL_TARGET=bootstrap-lean
.if defined(MAKE_TESTS)
ALL_TARGET+=check
.endif
# XXX we need to override do-build to get the warnings from within make
do-build:
@(cd ${WRKBUILD}; \
${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET} 2>warnings) || \
(echo "Make bootstrap failed."; \
echo "Don't forget to look at ${WRKBUILD}/warnings"; ${FALSE})
(echo "*** Make bootstrap failed."; \
echo "*** Look at ${WRKBUILD}/warnings for errors"; ${FALSE})
####
# Install section
# Install & tests section
# Tests should be performed at the end of install, since they depend upon
# having the correct flavor of libstdc++.so.
.if defined(MAKE_TESTS)
post-install:
@(cd ${WRKBUILD}; \
${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} ${MAKEFILE} check)
.endif
PLIST=${WRKBUILD}/PLIST

4
lang/egcs-stable/files/PLIST.template
View File

@ -1,5 +1,3 @@
@cwd /usr/local
@name DISTNAME
bin/egcc
bin/eprotoize
bin/eunprotoize
@ -205,7 +203,7 @@ include/g++/vector
include/g++/vector.h
lib/libstdc++.a
ifdef(`DYNAMIC',
lib/libstdc++.so.2.9
lib/libstdc++.so.29.0
lib/libstdc++.so.2.9.0
lib/libstdc++.so
)lib/gcc-lib/ARCH/VERSION/cc1plus

24
lang/egcs/stable/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.18 1999/03/21 07:51:08 espie Exp $
# $OpenBSD: Makefile,v 1.19 1999/03/25 21:51:27 espie Exp $
# This is a configuration file for egcs, stable release.
@ -159,6 +159,9 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \
CONFIGURE_ARGS+=${CONFIGURE_SHARED}
# Not really stable yet
# CONFIGURE_ARGS+= --enable-threads=yes
SEPARATE_BUILD=simple
# rebuild configure files after patching, then move source around !!!
@ -177,19 +180,24 @@ pre-configure:
# use bootstrap-lean if you're pressed for space
ALL_TARGET=bootstrap
# ALL_TARGET=bootstrap-lean
.if defined(MAKE_TESTS)
ALL_TARGET+=check
.endif
# XXX we need to override do-build to get the warnings from within make
do-build:
@(cd ${WRKBUILD}; \
${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET} 2>warnings) || \
(echo "Make bootstrap failed."; \
echo "Don't forget to look at ${WRKBUILD}/warnings"; ${FALSE})
(echo "*** Make bootstrap failed."; \
echo "*** Look at ${WRKBUILD}/warnings for errors"; ${FALSE})
####
# Install section
# Install & tests section
# Tests should be performed at the end of install, since they depend upon
# having the correct flavor of libstdc++.so.
.if defined(MAKE_TESTS)
post-install:
@(cd ${WRKBUILD}; \
${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} ${MAKEFILE} check)
.endif
PLIST=${WRKBUILD}/PLIST

4
lang/egcs/stable/files/PLIST.template
View File

@ -1,5 +1,3 @@
@cwd /usr/local
@name DISTNAME
bin/egcc
bin/eprotoize
bin/eunprotoize
@ -205,7 +203,7 @@ include/g++/vector
include/g++/vector.h
lib/libstdc++.a
ifdef(`DYNAMIC',
lib/libstdc++.so.2.9
lib/libstdc++.so.29.0
lib/libstdc++.so.2.9.0
lib/libstdc++.so
)lib/gcc-lib/ARCH/VERSION/cc1plus