diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2015-04-03 11:26:48 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2015-04-03 11:26:48 +0000 |
| commit | 0438143249634ab5028e53cb468d99a894c62995 (patch) | |
| tree | 204c01c7973e83331fc29d8b09e59b3e9f219bd6 /lang/smlnj | |
| parent | sysutils/jail-primer: update 0.1 -> 0.2 (diff) | |
Remove OSVERSION checks that do not make sense any more.
For example (${OSVERSION} >= 900000 && ${OSVERSION} < 900021) is always true,
as is (${OSVERSION} > 900002 || ${OSVERSION} < 900000 && ${OSVERSION} > 800107).
Regarding patches, when an EXTRA_PATCHES is no longer needed, I remove it, when
it is always needed, I renamed it, in one case, I merged two patches.
Differential Revision: https://reviews.freebsd.org/D2209
Notes
Notes:
svn path=/head/; revision=383107
Diffstat (limited to 'lang/smlnj')
| -rw-r--r-- | lang/smlnj/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lang/smlnj/Makefile b/lang/smlnj/Makefile index 87ff55f75a45..e6d0a871a28c 100644 --- a/lang/smlnj/Makefile +++ b/lang/smlnj/Makefile @@ -43,7 +43,7 @@ ML_RECOMPILE_OPTIONS= RECOMPILE POSITION64 .if (${ARCH} == "amd64") && (${OSVERSION} >= 1000029) ONLY_FOR_ARCHS= i386 amd64 -.elif (${ARCH} == "amd64") && (${OSVERSION} >= 800000) +.elif (${ARCH} == "amd64") ONLY_FOR_ARCHS= i386 amd64 # Compilation of the i386 runtime source on older amd64 systems requires # i386 system headers from the respective FreeBSD Version, taken from @@ -181,7 +181,7 @@ RECOMPILEDIR= base/system RECOMPILEDIR= .endif -.if (${ARCH} == "amd64") && (${OSVERSION} >= 800000) && (${OSVERSION} < 1000029) +.if (${ARCH} == "amd64") && (${OSVERSION} < 1000029) MLRUNTIMEPATCHES_CMD= cd ${FILESDIR} && \ ( ${LS} do-patch-base_runtime_* extra-patch-base_runtime_* 2>&- || \ ${TRUE} ) |