diff options
| author | Kris Kennaway <kris@FreeBSD.org> | 2004-09-30 05:21:01 +0000 |
|---|---|---|
| committer | Kris Kennaway <kris@FreeBSD.org> | 2004-09-30 05:21:01 +0000 |
| commit | 7f1f3ccd34d630b6ecadba06486cbbf580ff554e (patch) | |
| tree | a9909a26579dc5882061ef8d4cab62831ad91306 | |
| parent | a2d28759eac7dbf88ec76791b4b8e9eca9d8c8a8 (diff) | |
| download | ports-7f1f3ccd34d630b6ecadba06486cbbf580ff554e.tar.gz ports-7f1f3ccd34d630b6ecadba06486cbbf580ff554e.zip | |
* Support USE_GCC=3.[34] properly, and allow newer 5.x systems to
build ports with older USE_GCC versions (useful in certain cases for
working around compile errors with newer gcc versions) [1] [2] [3] [4]
(based on)
* Only spit out the TRYBROKEN message when a BROKEN string is defined
PR: ports/70322 [1], ports/71344 [2], ports/64316 [3]
Submitted by: obrien [1], Xin LI <delphij@frontfree.net> [2],
trevor [3], jkoshy [4], et. al.
Approved by: portmgr
Notes
Notes:
svn path=/head/; revision=118502
| -rw-r--r-- | Mk/bsd.port.mk | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index a5146818808e..803d85ea9f55 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1289,11 +1289,11 @@ GCCVERSION= 030100 .if ${OSVERSION} >= 500039 && ${OSVERSION} < 501103 GCCVERSION= 030200 .endif -.if ${OSVERSION} >= 501103 +.if ${OSVERSION} >= 501103 && ${OSVERSION} < 502126 GCCVERSION= 030301 .endif -.if ${OSVERSION} >= 599999 -GCCVERSION= 030400 +.if ${OSVERSION} >= 502126 +GCCVERSION= 030402 .endif .endif @@ -1311,26 +1311,26 @@ F77= g77-31 BUILD_DEPENDS+= gcc31:${PORTSDIR}/lang/gcc31 GCCVERSION= 030100 .endif -.if ${USE_GCC} == 3.2 && ${OSVERSION} < 500039 +.if ${USE_GCC} == 3.2 && ( ${OSVERSION} < 500039 || ${OSVERSION} > 501102 ) CC= gcc32 CXX= g++32 F77= g77-32 BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32 GCCVERSION= 030200 .endif -.if ${USE_GCC} == 3.3 && ${OSVERSION} < 501103 +.if ${USE_GCC} == 3.3 && ( ${OSVERSION} < 501103 || ${OSVERSION} > 502125 ) CC= gcc33 CXX= g++33 F77= g77-33 BUILD_DEPENDS+= gcc33:${PORTSDIR}/lang/gcc33 GCCVERSION= 030301 .endif -.if ${USE_GCC} == 3.4 # Not yet available in any OSVERSION +.if ${USE_GCC} == 3.4 && ${OSVERSION} < 502126 CC= gcc34 CXX= g++34 F77= g77-34 BUILD_DEPENDS+= gcc34:${PORTSDIR}/lang/gcc34 -GCCVERSION= 030400 +GCCVERSION= 030402 .endif MAKE_ENV+= CC="${CC}" CXX="${CXX}" .endif @@ -2793,7 +2793,7 @@ pre-everything:: @${DO_NADA} buildanyway-message: -.if defined(TRYBROKEN) +.if defined(TRYBROKEN) && defined(BROKEN) @${ECHO_MSG} "Trying build of ${PKGNAME} even though it is marked BROKEN." .else @${DO_NADA} |