Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2016Q3

Browse Source
This commit is contained in:
sambuc
2016-11-18 22:39:22 +01:00
committed by sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949747 additions and 377081 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lang/smlnj/Makefile
+76 -30
View File
@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.24 2012/10/02 20:11:53 asau Exp $
# $NetBSD: Makefile,v 1.34 2016/07/03 19:38:27 dholland Exp $
#
DISTNAME= boot.${BOX}-unix
@@ -31,6 +31,7 @@ HOMEPAGE= http://www.smlnj.org/index.html
COMMENT= Popular functional language from Bell Labs
SML_VERSION= 110.73
PKGREVISION= 2
WRKSRC= ${WRKDIR}
DIST_SUBDIR= smlnj-${SML_VERSION}
@@ -44,51 +45,96 @@ SML_LIBDIR= ${SML_BASE}/lib
SML_BINDIR= ${SML_BASE}/bin
SML_SCRIPTS= _link-sml _run-sml _ml-build _ml-makedepend
# while building, the work directory is the "installation"
BUILD_ENV+= SMLNJ_HOME="${WRKDIR}"
# the build uses patch directly (yuk)
BUILD_ENV+= PATCH=${PATCH:Q} PATCH_ARGS=${PATCH_ARGS:Q}
# useful for debugging
#CFLAGS+= -Wall
# note that this includes bsd.prefs.mk
.include "../../lang/smlnj/Makefile.common"
# create parent directory for the runtime system
#
# For smlnj reasons the runtime system needs to be unpacked twice, once
# in work/src and once in work/base.
#
# As of 20160624, instead of inconsistently patching one copy or the
# other and hoping, or patching both and duplicating all the patches,
# we'll patch only work/src, and then *after* patching clone work/src
# into work/base.
#
# create parent directories for the runtime system
pre-extract:
${MKDIR} ${WRKDIR}/src || ${TRUE}
${MKDIR} ${WRKDIR}/base || ${TRUE}
# make it easier to patch the runtime system
do-extract:
${RUN} extract_file="${_DISTDIR}/config.tgz"; export extract_file; \
${RUN} extract_file="${_DISTDIR}/config.tgz"; \
export extract_file; \
cd ${WRKDIR}; ${EXTRACT_CMD}
${RUN} extract_file="${_DISTDIR}/runtime.tgz"; export extract_file; \
${RUN} extract_file="${_DISTDIR}/runtime.tgz"; \
export extract_file; \
cd ${WRKDIR}/src; ${EXTRACT_CMD}
${RUN} extract_file="${_DISTDIR}/runtime.tgz"; export extract_file; \
mkdir ${WRKDIR}/base; cd ${WRKDIR}/base; ${EXTRACT_CMD}
# make symlinks to the dist files
# symlink the rest of the distfiles
# also copy in new configs
post-extract:
cd ${WRKDIR} && ${LN} -sf ${_DISTDIR}/* .
cd ${WRKDIR} && ${LN} -sf ${_DISTDIR}/* .
cp ${FILESDIR}/mk.* ${WRKDIR}/src/runtime/objs/
# resolve definition of SML_BASE, CFLAGS in patched files
# make the necessary copy of the runtime, _after_ patching src
post-patch:
cd ${WRKDIR}/src && pax -rw runtime ${WRKDIR}/base/
# Turn of nlffi on powerpc (I guess it doesn't work?)
#
# XXX: this switch doesn't work any more as the line in question doesn't
# exist in the current version. Someone with a PPC build machine,
# please check it out and either change it to match the file if still
# needed, or get rid of it.
.if ${MACHINE_ARCH} == "powerpc"
SUBST_CLASSES+= nlffi
SUBST_STAGE.nlffi= pre-configure
SUBST_MESSAGE.nlffi= Turning off nlffi
SUBST_FILES.nlffi= config/targets
SUBST_SED.nlffi= -e '/^request nlffi$$/d'
.endif # powerpc
# resolve definition of SML_BASE
SUBST_CLASSES+= smlbase
SUBST_STAGE.smlbase= pre-configure
SUBST_MESSAGE.smlbase= Setting SML_BASE
SUBST_FILES.smlbase= ${SML_SCRIPTS:S/^/config\//}
SUBST_VARS.smlbase= SML_BASE
# resolve definition of CFLAGS in patched files
# (note that we need to do this in both src/runtime and base/runtime)
SUBST_CLASSES+= cflags
SUBST_STAGE.cflags= pre-configure
SUBST_MESSAGE.cflags= Setting CFLAGS
SUBST_FILES.cflags= src/runtime/objs/* base/runtime/objs/*
SUBST_VARS.cflags= CFLAGS
# use the proper shell
SUBST_CLASSES+= shell
SUBST_STAGE.shell= pre-configure
SUBST_MESSAGE.shell= Choosing the right shell
SUBST_FILES.shell= config/install.sh
SUBST_VARS.shell= CONFIG_SHELL
# nothing here any more
do-configure:
if [ ${MACHINE_ARCH} = "powerpc" ]; then \
${AWK} '(! /^request nlffi$$/) { print }' \
< ${WRKDIR}/config/targets \
> ${WRKDIR}/temp; \
${MV} ${WRKDIR}/temp ${WRKDIR}/config/targets; \
fi
cd ${WRKDIR}/config; \
for f in ${SML_SCRIPTS}; do \
${CP} "$${f}" "$${f}.tmp"; \
${SED} -e 's|@SML_BASE@|${SML_BASE}|g' \
< "$${f}.tmp" > "$${f}"; \
done; \
cd ${WRKDIR}/src/runtime/objs; \
for f in *; do \
${CP} "$${f}" "$${f}.tmp"; \
${SED} -e 's|@CFLAGS@|${CFLAGS}|g' \
< "$${f}.tmp" > "$${f}"; \
done
${DO_NADA}
# The build target needs to run $WRKDIR/config/install.sh
do-build:
cd ${WRKDIR} && unset PWD && \
FILESDIR="${FILESDIR}" PATCH="${PATCH}" PATCH_ARGS="${PATCH_ARGS}" \
SMLNJ_HOME="${WRKDIR}" ./config/install.sh
cd ${WRKDIR} && unset PWD && ${SETENV} ${BUILD_ENV} \
${CONFIG_SHELL} ./config/install.sh
# install target
# (see ftp://ftp.research.bell-labs.com/dist/smlnj/working/110.38/INSTALL)
lang/smlnj/Makefile.common
+2 -2
View File
@@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.13 2015/04/22 07:41:38 dholland Exp $
# $NetBSD: Makefile.common,v 1.14 2016/04/14 21:59:08 dholland Exp $
#
# used by lang/smlnj/Makefile
@@ -35,7 +35,7 @@ OS= ${LOWER_OPSYS}
PLIST_VARS+= nlffi # not available on all platforms
.if ${MACHINE_ARCH} == "i386"
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
BOX= x86
PLIST.nlffi= yes
.elif ${MACHINE_ARCH} == "powerpc"
lang/smlnj/distinfo
+63 -16
View File
@@ -1,81 +1,128 @@
$NetBSD: distinfo,v 1.15 2015/04/22 07:41:38 dholland Exp $
$NetBSD: distinfo,v 1.24 2016/07/03 19:35:13 dholland Exp $
SHA1 (smlnj-110.73/MLRISC.tgz) = 59a38a4a1c63cecf97764a99577b3f929b5ccbc9
RMD160 (smlnj-110.73/MLRISC.tgz) = dd951776482f37421a17701d67c051741691c6cb
SHA512 (smlnj-110.73/MLRISC.tgz) = e16a213face6dbc128fc117a6ea30042ee49aa3aa985b3b6a9ea4f3ebd8392e2fc9db96451f49eddeab8f35a36665c1dc3dc77b6c615eae1b277192f16805d6b
Size (smlnj-110.73/MLRISC.tgz) = 1422538 bytes
SHA1 (smlnj-110.73/boot.x86-unix.tgz) = f2a6b89708d41d5968bf6f2e2ee713704f3664fd
RMD160 (smlnj-110.73/boot.x86-unix.tgz) = c6fa71d7a14e79d095159ebd877b7562e88eeeb5
SHA512 (smlnj-110.73/boot.x86-unix.tgz) = 389f18bf989ff70aa4b4e174547bfc1ac00e5b3d0a57d60c96fc105252b94c8233fce0bdc868670386853bad9cc2a8643e9a1d3881bed1e0367d62a6451d6b78
Size (smlnj-110.73/boot.x86-unix.tgz) = 5838645 bytes
SHA1 (smlnj-110.73/ckit.tgz) = afbb7c03aa3aac813f4ce6686a68998b2612bea9
RMD160 (smlnj-110.73/ckit.tgz) = 56586583bbc8eff89e560e692705a7adc8f9c8e9
SHA512 (smlnj-110.73/ckit.tgz) = 555f5b3e7efaa73a9e30da03f664054f68dfe43072f4d380581cd77c5c75a6eb0f6ec296aa304d88d16f796227c45c0a1200c8f03bd6fc6f4160879edcd84299
Size (smlnj-110.73/ckit.tgz) = 196369 bytes
SHA1 (smlnj-110.73/cm.tgz) = 8662fe0ec182f8aacd0673f45bb8ee90fa4e422b
RMD160 (smlnj-110.73/cm.tgz) = ed3a6db81bd2e3c39e0cd1d09a96de97bc2831ca
SHA512 (smlnj-110.73/cm.tgz) = 1905f6d55bd0fe4e7453e55c802d0c454404a05cc3b8af6f1d127b95b6d30ca98a83d918bc6c984da187413efaf2ca85a8d7f84e73856d3d90c099f0a62614fe
Size (smlnj-110.73/cm.tgz) = 200409 bytes
SHA1 (smlnj-110.73/cml.tgz) = 80d75c04ab31b97690baae640285e86c758b8068
RMD160 (smlnj-110.73/cml.tgz) = e696982679aa30bc793069e611e34a723718aaa5
SHA512 (smlnj-110.73/cml.tgz) = 80e183fa7e490231922a56fdc376d037d9f70f02b53b784a18d37f01cb27a1a2efce52e6133fe7d97a306aebad0b417e303611c2bab7d2de270912f4ce80c3e9
Size (smlnj-110.73/cml.tgz) = 105746 bytes
SHA1 (smlnj-110.73/compiler.tgz) = 3ee0916bde53e92c270aa5f8115807d4af8538f3
RMD160 (smlnj-110.73/compiler.tgz) = 30a59b3b6a7502d1e224d8548b666517096786b5
SHA512 (smlnj-110.73/compiler.tgz) = 990f730ec7281cdb4af32c6092219b96356ac4f838f915caba58f990e2d402ad892155814671830c5bf1a4bff3061dd65f0f1158df5b31d99f46aa67c889a3ed
Size (smlnj-110.73/compiler.tgz) = 816713 bytes
SHA1 (smlnj-110.73/config.tgz) = 344542262c63cc0a9b3fdafc8c118ff0a880c779
RMD160 (smlnj-110.73/config.tgz) = 6fd5a5e24f2de634e266cde4ff96d25e7a17786c
SHA512 (smlnj-110.73/config.tgz) = 4d75243672e31948c58a979a298668c2f0cb58829d263ab10f2244ed8074a21de438b46a053d40546b9590779174bd6e5bf95c1944f0632c00b93c3ef60da5c8
Size (smlnj-110.73/config.tgz) = 511370 bytes
SHA1 (smlnj-110.73/eXene.tgz) = 7cccbbf90191b6d862f22658851996a2bba9943a
RMD160 (smlnj-110.73/eXene.tgz) = e087ac0944dfef3a491a8f02d85969b6ea393f19
SHA512 (smlnj-110.73/eXene.tgz) = 5a856c7092415b34a040b8fd962a613727994880f9df9cda7bb8485b95735b968ac5d7b8fc9a005e2adb2e2ad5f52dfe6111df6f50c6a317340c2cd2fb793e1d
Size (smlnj-110.73/eXene.tgz) = 703040 bytes
SHA1 (smlnj-110.73/heap2asm.tgz) = 7ae4b258e273b7e23709e34d5f23e2cc886a51e5
RMD160 (smlnj-110.73/heap2asm.tgz) = 28fd26d3740f7d2402a2579a727e36a5fc3c41ea
SHA512 (smlnj-110.73/heap2asm.tgz) = 9010d60ab3e274a50d71ac4c6a506f9561f73fe7a2c0e3bca5ebf96333ab38c8fc26feadb37d945dc16816e507389cf35fff5520b796d8882dc184c402b1be6c
Size (smlnj-110.73/heap2asm.tgz) = 1313 bytes
SHA1 (smlnj-110.73/ml-burg.tgz) = 35bd4683c66d5dbc4f688a747add9c8a7e1e09c3
RMD160 (smlnj-110.73/ml-burg.tgz) = 28fa2576667f3b15e0c91119c7a136cab976359c
SHA512 (smlnj-110.73/ml-burg.tgz) = e03d5a3a10f49b37531dee2e8608bc939a7f4d3b056c5d1bee374892f4fd67e9f56b63697057da6b212e1156b35ff2736e1cedd4823b64169a31b4cd2dc8782c
Size (smlnj-110.73/ml-burg.tgz) = 36341 bytes
SHA1 (smlnj-110.73/ml-lex.tgz) = b70ab6bae93ce8845e8f439baa56c50090b96eed
RMD160 (smlnj-110.73/ml-lex.tgz) = 7685914a37c217ad1ec38750c598cda668bb0136
SHA512 (smlnj-110.73/ml-lex.tgz) = ce4ba26c0f55c85911f69cedc1e2d4207bfa8ce7a7b824dedb3d97e465b020d4531d77c06d156fc825d7ffff3e145d2088af454cca508ac8ef9df36334bd7960
Size (smlnj-110.73/ml-lex.tgz) = 33146 bytes
SHA1 (smlnj-110.73/ml-lpt.tgz) = 54ca9f64e02bc71b08addd229895f889066fcec9
RMD160 (smlnj-110.73/ml-lpt.tgz) = 4c3669ecff6119f5114f31acff36d68c35d1a082
SHA512 (smlnj-110.73/ml-lpt.tgz) = b23fca353b9d4a6dc4da25be8395b1add4ccf3bc6f16da2b960c2f816d5a89bd8b87eadf10f8c41dcfe55bbd2a6376aeaf4fab530fc5efad85299e49595348d1
Size (smlnj-110.73/ml-lpt.tgz) = 254557 bytes
SHA1 (smlnj-110.73/ml-yacc.tgz) = e360b0402f67d0e305f31c83429a81c7ec408c41
RMD160 (smlnj-110.73/ml-yacc.tgz) = b1b88d5ccd6b20d8dea06e9a99dfe14282683da0
SHA512 (smlnj-110.73/ml-yacc.tgz) = 316f3e3e220d2de9d7d3a3a162b854ccf3b18767b6f6542b69d23ee3a7350fe8a38d98631ec30f9f01bdb55a6a23c805014680f111b3179b76fc293eed6ab4b6
Size (smlnj-110.73/ml-yacc.tgz) = 99921 bytes
SHA1 (smlnj-110.73/nlffi.tgz) = 51f8ce2900a250467f8cc7e1a5849c1f0107efac
RMD160 (smlnj-110.73/nlffi.tgz) = a72b0d21762b733bf33d942bc2f10243a4b04cbc
SHA512 (smlnj-110.73/nlffi.tgz) = fcf5c5ed9d853c75d3e4149e6682755512f97941d67133072a3857e0b96a847c12bd612e3774f995173dcbea4f17f290e61f32f9c829f23372073a983f5e57cf
Size (smlnj-110.73/nlffi.tgz) = 74485 bytes
SHA1 (smlnj-110.73/pgraph.tgz) = f411177861e99e767987cea9bcd413008e45d2f9
RMD160 (smlnj-110.73/pgraph.tgz) = 5a974d3f0003d6e161f428ae8f5e79fa7019bd6c
SHA512 (smlnj-110.73/pgraph.tgz) = 37cb511716d1ba42d11528c390c4df629208a6146c7e3399ce956b86bfdd54e4e05d9a61ad90c5ebd3d7daaa556406fa85477073e91b1d3aea326cc4ccfa66b2
Size (smlnj-110.73/pgraph.tgz) = 5441 bytes
SHA1 (smlnj-110.73/runtime.tgz) = d67d8eb4a12ae4272d0a3f02e94e0c38de20efa1
RMD160 (smlnj-110.73/runtime.tgz) = e4e179063e053cac593452009c1eb7a6d194ff63
SHA512 (smlnj-110.73/runtime.tgz) = 679c20aaa270bccaaea72b01ef5f37ce81af3ec6e6288672d1acfc5f1e57f2688fddf609db9b47e48320eb03df57e9f4ef5560be5e6af4e173470d4bc5c7c05b
Size (smlnj-110.73/runtime.tgz) = 323625 bytes
SHA1 (smlnj-110.73/smlnj-c.tgz) = fc8e3663f4db3720fa838c088d418c79e950b4ea
RMD160 (smlnj-110.73/smlnj-c.tgz) = 7a7a301f749e64e12985c8a36710551e69ad4f08
SHA512 (smlnj-110.73/smlnj-c.tgz) = 5e594614d61106ca773bcc06e2b60200d3194e2ef85b2a83490cb609af97c0051f647328b31fa0083940debf6c02e3f16ea74fe44d5b52288bbb37777a9d1c66
Size (smlnj-110.73/smlnj-c.tgz) = 10532 bytes
SHA1 (smlnj-110.73/smlnj-lib.tgz) = 7fe0cf25c0ad9cf63e4472d190d8bdb7d3083cef
RMD160 (smlnj-110.73/smlnj-lib.tgz) = d0a883dcd3cb59e16671b79e2230fa55c1ee7131
SHA512 (smlnj-110.73/smlnj-lib.tgz) = 84ebd305fdd64336ec7ca77ae57943d4c92b0e0bca6be234438460c34e89974841f48c8b8a0b7e2298cdbb5ead9ad40b720a30c4edb9438fc3ec1fe28458c027
Size (smlnj-110.73/smlnj-lib.tgz) = 497319 bytes
SHA1 (smlnj-110.73/system.tgz) = 423816ef96b8b830bc1d708b1484240de2399b4b
RMD160 (smlnj-110.73/system.tgz) = 01c0a0c4f2ea0a0615c3c1b55fa88a46bfc8de68
SHA512 (smlnj-110.73/system.tgz) = 29cce8b727598da425b8c5b9957a3ebe759bfa15a754e94e120034ac8a9b78c30fd64b2e15626046b155190e62fee011f05e55e222aacd5b3c6eba80eafbfafe
Size (smlnj-110.73/system.tgz) = 227056 bytes
SHA1 (smlnj-110.73/trace-debug-profile.tgz) = 1879601267411bf03ef6d8c06422d56b0548929d
RMD160 (smlnj-110.73/trace-debug-profile.tgz) = e6cdae53b060c85782424d792bdf4673c5ddbf1e
SHA512 (smlnj-110.73/trace-debug-profile.tgz) = f806a36a2d9d500af0975f8d2ebb38b8189fc9732f3163ad3bc3c7b7fd13cba965ab41754b4e37ef576005b2733b41cf291fb2d4ae5c47ec2a51a751507b911f
Size (smlnj-110.73/trace-debug-profile.tgz) = 3899 bytes
SHA1 (patch-aa) = a67e8438c0ae20c1f0fac37148158b565056e5f7
SHA1 (patch-ab) = 3d5946b2d72dee255159afe6fb25240f8fa7e306
SHA1 (patch-ad) = a406bde2f6f7e2d93d652135b94aefd4b7aca494
SHA1 (patch-ae) = 5796401418fd91a795fdfe75060cf654dd315ac1
SHA1 (patch-af) = fae22c6f367b3007bbd9b46b7a7a218710723ca4
SHA1 (patch-ag) = dae9c89ccc7ada96bd3ac4b2bae1da6427902fb4
SHA1 (patch-aa) = f738a6284236158b6b95928768fe1213cc77fc20
SHA1 (patch-ad) = 67802bbdf42408c60bbce4087f20d000a3445677
SHA1 (patch-ae) = 0ba98fb2b012daf75dcc4ac416cbf0fd3182114b
SHA1 (patch-af) = 3a1c1cadd26eb246adafff823d49b4ab7161793b
SHA1 (patch-ah) = 93d7453dc82d91d29662cc02dd8ab9e8b8987393
SHA1 (patch-ai) = 6a15a5415bd73e6618bc45b9a7eb021543e9cecd
SHA1 (patch-aj) = 6318548da4c943c60fe63d41529803ea3fa2c96e
SHA1 (patch-ak) = 6fb3d4444c75123dc8c5fa7bb6cea835c78ef6e3
SHA1 (patch-am) = 06d8cb145217c46ada440e0d3e7420ea99651064
SHA1 (patch-an) = d6e1a75d5fb68423ce3181622de919c2337db2e7
SHA1 (patch-ao) = 1c66024c5949269291cbf6f815baf6162db47d31
SHA1 (patch-ap) = 8e9e28548b4e58de68a11982a355a010ea96aa29
SHA1 (patch-aq) = 7d0734b76d778d7f584d2e70d325fd72e6554b01
SHA1 (patch-at) = 376b67d25ef428377b1686fcd6232628867d6eae
SHA1 (patch-base_runtime_objs_mk.x86-netbsd) = 1e5ca88c65066a07b818af76abc2f9f1bafdc339
SHA1 (patch-config___arch-n-opsys) = 83b357d78c0762c9b0c295444bfe9e5641aa02e0
SHA1 (patch-src_runtime_objs_mk.x86-netbsd) = bd29b208b68771ecd1f3c64d896653084c6eb30e
SHA1 (patch-am) = 95f3e5a041163279f68e782469a30f6f765b7511
SHA1 (patch-an) = 3d750d5d20b2d3ab69b492eb60e27aded45ec3f7
SHA1 (patch-ao) = 1cf3dfb01314556bcb0cd61e2d0d1577e1cebc04
SHA1 (patch-ap) = af8b50c0f21e969e036064f5c808eaccc79d5c4b
SHA1 (patch-aq) = 32d96ad2552d5ac914581686904e94a96e5ca059
SHA1 (patch-at) = cd7d23adaf8882e9b431d6581283fdb58044e05c
SHA1 (patch-config___arch-n-opsys) = b0c952b0b9ed6312a115761fdbd4c30aaa208b4c
SHA1 (patch-src_runtime_c-libs_posix-filesys_stat.c) = d5a315ac342a8a59099ae9eb131c899250a2404f
SHA1 (patch-src_runtime_c-libs_posix-filesys_stat__64.c) = 2a3e1f6ffc8f688e3c2ebf8b5913481093feb0fa
SHA1 (patch-src_runtime_c-libs_posix-procenv_time.c) = 4c38da9110687b179237deef7fee389e0bbece4c
SHA1 (patch-src_runtime_c-libs_smlnj-date_mktime.c) = a3bcb173a99972ab65208f65083bb30a7e09ab67
SHA1 (patch-src_runtime_c-libs_smlnj-runtime_gc-ctl.c) = 673d04282ef95093012a2c1e2b66d867357ee4ef
SHA1 (patch-src_runtime_gc_c-globals-tbl.c) = 19ac4ccc3ed0e784c1aeab0fe3ed781417540561
SHA1 (patch-src_runtime_gc_gc-stats.h) = af61db9d1f04e566d4c5c2bc5dcf4c6958f0ea78
SHA1 (patch-src_runtime_gc_heap-out-util.c) = 214c673e57efda9346b200509a1beb48af2aa443
SHA1 (patch-src_runtime_gc_init-gc.c) = 5d1d5a13a51d732590dd4f375824bbc389a0525d
SHA1 (patch-src_runtime_gc_mem-writer.c) = d43974ff5e8e576490656f9d24daf66fecab4849
SHA1 (patch-src_runtime_kernel_main.c) = db26470b16f56e93ebecc62f34aa6b7a474089ec
SHA1 (patch-src_runtime_kernel_unix-timers.c) = 1c1db5bce0ec1e72adafb9380027884cf746c75c
SHA1 (patch-src_runtime_mach-dep_unix-prof.c) = 90a4b81e2a8532e4e06f29bfe42c55423a0f4154
SHA1 (patch-src_runtime_objs_mk.alpha32-dunix) = 9e3a36f4663cd685459f2fbde41b8c5f154bd9c2
SHA1 (patch-src_runtime_objs_mk.alpha32x-osf1) = 6e91f672aadb77bd1d1ab65bfa66e3d7f745846c
SHA1 (patch-src_runtime_objs_mk.hppa-hpux) = 40ca27d05490983e734b4d20eecd268935ad2461
SHA1 (patch-src_runtime_objs_mk.hppa-hpux11) = c7ad7769ba05b4fe609a6396d2c8dadb80256e06
SHA1 (patch-src_runtime_objs_mk.hppa-hpux9) = 6adacac502cd12576ea65882984979ce3aa78b41
SHA1 (patch-src_runtime_objs_mk.ppc-aix) = 509ffc0152b2cdfa4e0f6621bed026fe0f1edc99
SHA1 (patch-src_runtime_objs_mk.ppc-darwin) = 6ae822c7b39255b5204e358e3c21aa23b93883ec
SHA1 (patch-src_runtime_objs_mk.ppc-darwin5) = 35ddd1f10a907ebbe6b4a3310c3bded83bda8ca0
SHA1 (patch-src_runtime_objs_mk.ppc-linux) = 171ec491a536aa782880d3b3392cf0d728fd9c03
SHA1 (patch-src_runtime_objs_mk.x86-cygwin) = b9e1174a956a63b1023eaf70322776fe93717782
SHA1 (patch-src_runtime_objs_mk.x86-darwin) = 7770986d2805f66f1c4d4faff2fb66b2fb4b7b8d
SHA1 (patch-src_runtime_objs_mk.x86-freebsd) = 2420f6a04ae78ca306daeb94a312f0e4fdcd0410
SHA1 (patch-src_runtime_objs_mk.x86-linux) = 4905280351b88b5a74f3bd68dadcdca6fd2037ac
SHA1 (patch-src_runtime_objs_mk.x86-linux-pthreads) = 5c2730e09b05c3a00abb3ea6c732e39775973f79
SHA1 (patch-src_runtime_objs_mk.x86-netbsd) = 3a8e93e55ed9bba470a680c327cb4e4d22d69ff4
SHA1 (patch-src_runtime_objs_mk.x86-netbsd2) = 98408821e7c1f3ca6f50f5d9e230c903173029e1
SHA1 (patch-src_runtime_objs_mk.x86-openbsd) = da536769b231e01a5fb045fe7dd329eee15b6706
SHA1 (patch-src_runtime_objs_mk.x86-solaris) = 125814c60fd42389df9a1d5dbcd4313e7cabb53c
lang/smlnj/files/mk.ppc-netbsd
+25
View File
@@ -0,0 +1,25 @@
# mk.ppc-netbsd
# $NetBSD: mk.ppc-netbsd,v 1.1 2016/07/03 19:26:35 dholland Exp $
#
SHELL = /bin/sh
MAKE = gmake
GCC = gcc
ARFLAGS = Trcv
CFLAGS = @CFLAGS@
LDFLAGS=
CPP = $(GCC) -x c -E -P
#XOBJS = xmonitor.o
#LD_LIBS = -lX11
#BASE_DEFS = -DHEAP_MONITOR -DPOLL_DEBUG
XOBJS =
XLIBS =
DEFS = $(BASE_DEFS) -DHOST_PPC -DTARGET_PPC -DOPSYS_UNIX -DOPSYS_NETBSD
TARGET = PPC
VERSION = v-ppc-netbsd
RUNTIME = run.ppc-netbsd
all:
($(MAKE) RUNTIME="$(RUNTIME)" MAKE="$(MAKE)" VERSION="$(VERSION)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" AS="$(AS)" AR="$(AR)" RANLIB="$(RANLIB)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME))
lang/smlnj/files/mk.sparc-netbsd
+25
View File
@@ -0,0 +1,25 @@
# mk.sparc-netbsd
# $NetBSD: mk.sparc-netbsd,v 1.1 2016/07/03 19:26:35 dholland Exp $
#
SHELL = /bin/sh
MAKE = gmake
GCC = gcc
ARFLAGS = Trcv
CFLAGS = @CFLAGS@
LDFLAGS=
CPP = $(GCC) -x c -E -P
#XOBJS = xmonitor.o
#LD_LIBS = -lX11
#BASE_DEFS = -DHEAP_MONITOR -DPOLL_DEBUG
XOBJS =
XLIBS =
DEFS = $(BASE_DEFS) -DHOST_SPARC -DTARGET_SPARC -DOPSYS_UNIX -DOPSYS_NETBSD -DCALLEESAVE=3 -DUNBOXEDFLOAT=1
TARGET = SPARC
VERSION = v-sparc-netbsd
RUNTIME = run.sparc-netbsd
all:
($(MAKE) RUNTIME="$(RUNTIME)" MAKE="$(MAKE)" VERSION="$(VERSION)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" AS="$(AS)" AR="$(AR)" RANLIB="$(RANLIB)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME))
lang/smlnj/files/targets
-15
View File
@@ -1,15 +0,0 @@
request ml-yacc
request ml-lex
request ml-burg
request smlnj-lib
request pgraph-util
request cml
request cml-lib
request eXene
request ckit
#if !defined(__powerpc__)
request ml-nlffi-lib
request ml-nlffigen
#endif
request mlrisc-tools
request nowhere
lang/smlnj/patches/patch-aa
+3 -1
View File
@@ -1,4 +1,6 @@
$NetBSD: patch-aa,v 1.6 2010/02/07 03:14:36 asau Exp $
$NetBSD: patch-aa,v 1.7 2016/04/14 22:04:47 dholland Exp $
Configure for pkgsrc.
--- config/targets.orig 2010-02-03 19:40:28.000000000 +0300
+++ config/targets 2010-02-07 05:56:52.000000000 +0300
lang/smlnj/patches/patch-ab
-29
View File
@@ -1,29 +0,0 @@
$NetBSD: patch-ab,v 1.2 2003/07/01 23:19:13 jtb Exp $
--- /dev/null
+++ src/runtime/objs/mk.ppc-netbsd
@@ -0,0 +1,24 @@
+# mk.ppc-netbsd
+#
+
+SHELL = /bin/sh
+
+MAKE = gmake
+GCC = gcc
+ARFLAGS = Trcv
+CFLAGS = @CFLAGS@
+LDFLAGS=
+CPP = $(GCC) -x c -E -P
+
+#XOBJS = xmonitor.o
+#LD_LIBS = -lX11
+#BASE_DEFS = -DHEAP_MONITOR -DPOLL_DEBUG
+XOBJS =
+XLIBS =
+DEFS = $(BASE_DEFS) -DHOST_PPC -DTARGET_PPC -DOPSYS_UNIX -DOPSYS_NETBSD
+TARGET = PPC
+VERSION = v-ppc-netbsd
+RUNTIME = run.ppc-netbsd
+
+all:
+ ($(MAKE) RUNTIME="$(RUNTIME)" MAKE="$(MAKE)" VERSION="$(VERSION)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" AS="$(AS)" AR="$(AR)" RANLIB="$(RANLIB)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME))
lang/smlnj/patches/patch-ad
+3 -1
View File
@@ -1,4 +1,6 @@
$NetBSD: patch-ad,v 1.3 2003/07/01 23:19:14 jtb Exp $
$NetBSD: patch-ad,v 1.4 2016/04/14 22:04:47 dholland Exp $
Support for NetBSD.
--- src/runtime/include/asm-base.h.orig
+++ src/runtime/include/asm-base.h
lang/smlnj/patches/patch-ae
+3 -1
View File
@@ -1,4 +1,6 @@
$NetBSD: patch-ae,v 1.1.1.1 2003/03/21 22:20:56 wiz Exp $
$NetBSD: patch-ae,v 1.2 2016/04/14 22:04:47 dholland Exp $
Support for NetBSD.
--- src/runtime/mach-dep/SPARC.prim.asm.orig Fri Jun 15 15:05:19 2001
+++ src/runtime/mach-dep/SPARC.prim.asm
lang/smlnj/patches/patch-af
+3 -1
View File
@@ -1,4 +1,6 @@
$NetBSD: patch-af,v 1.5 2009/09/22 14:48:47 asau Exp $
$NetBSD: patch-af,v 1.6 2016/04/14 22:04:47 dholland Exp $
Support for NetBSD, and for NetBSD on PPC.
--- src/runtime/mach-dep/signal-sysdep.h.orig 2006-02-27 17:47:32.000000000 +0000
+++ src/runtime/mach-dep/signal-sysdep.h 2006-03-09 19:15:48.000000000 +0000
lang/smlnj/patches/patch-ag
-29
View File
@@ -1,29 +0,0 @@
$NetBSD: patch-ag,v 1.2 2003/03/21 22:54:39 wiz Exp $
--- src/runtime/objs/mk.sparc-netbsd.orig Thu Sep 19 03:54:01 2002
+++ src/runtime/objs/mk.sparc-netbsd
@@ -0,0 +1,24 @@
+# mk.sparc-netbsd
+#
+
+SHELL = /bin/sh
+
+MAKE = gmake
+GCC = gcc
+ARFLAGS = Trcv
+CFLAGS = @CFLAGS@
+LDFLAGS=
+CPP = $(GCC) -x c -E -P
+
+#XOBJS = xmonitor.o
+#LD_LIBS = -lX11
+#BASE_DEFS = -DHEAP_MONITOR -DPOLL_DEBUG
+XOBJS =
+XLIBS =
+DEFS = $(BASE_DEFS) -DHOST_SPARC -DTARGET_SPARC -DOPSYS_UNIX -DOPSYS_NETBSD -DCALLEESAVE=3 -DUNBOXEDFLOAT=1
+TARGET = SPARC
+VERSION = v-sparc-netbsd
+RUNTIME = run.sparc-netbsd
+
+all:
+ ($(MAKE) RUNTIME="$(RUNTIME)" MAKE="$(MAKE)" VERSION="$(VERSION)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" AS="$(AS)" AR="$(AR)" RANLIB="$(RANLIB)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME))
lang/smlnj/patches/patch-am
+3 -1
View File
@@ -1,4 +1,6 @@
$NetBSD: patch-am,v 1.1 2003/03/21 22:54:42 wiz Exp $
$NetBSD: patch-am,v 1.2 2016/04/14 22:04:47 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.sparc-solaris.orig Fri Jun 15 15:05:19 2001
+++ src/runtime/objs/mk.sparc-solaris
lang/smlnj/patches/patch-an
+3 -1
View File
@@ -1,4 +1,6 @@
$NetBSD: patch-an,v 1.1 2003/03/21 22:54:43 wiz Exp $
$NetBSD: patch-an,v 1.2 2016/04/14 22:04:47 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.sparc-sunos.orig Thu Jun 1 14:33:52 2000
+++ src/runtime/objs/mk.sparc-sunos
lang/smlnj/patches/patch-ao
+16 -3
View File
@@ -1,8 +1,11 @@
$NetBSD: patch-ao,v 1.2 2003/07/01 23:19:14 jtb Exp $
$NetBSD: patch-ao,v 1.3 2016/07/03 19:35:13 dholland Exp $
--- src/runtime/kernel/boot.c.orig
- use fgetc correctly
- fix uninitialized variable detected by gcc5
--- src/runtime/kernel/boot.c.orig 2005-11-02 22:24:39.000000000 +0000
+++ src/runtime/kernel/boot.c
@@ -124,7 +124,7 @@
@@ -130,7 +130,7 @@ PVT ml_val_t BuildFileList (ml_state_t *
ml_val_t fileList;
# define SIZE_BUF_LEN 128 /* this should be plenty for two numbers */
char sizeBuf[SIZE_BUF_LEN];
@@ -11,3 +14,13 @@ $NetBSD: patch-ao,v 1.2 2003/07/01 23:19:14 jtb Exp $
numFiles = 0;
@@ -175,6 +175,9 @@ PVT ml_val_t BuildFileList (ml_state_t *
}
fclose (listF);
}
+ else {
+ *mbplp = 0;
+ }
/* create the in-heap list */
for (fileList = LIST_nil, i = numFiles; --i >= 0; ) {
lang/smlnj/patches/patch-ap
+3 -1
View File
@@ -1,4 +1,6 @@
$NetBSD: patch-ap,v 1.2 2003/07/01 23:19:14 jtb Exp $
$NetBSD: patch-ap,v 1.3 2016/04/14 22:04:47 dholland Exp $
NetBSD support.
--- src/runtime/include/cache-flush.h.orig
+++ src/runtime/include/cache-flush.h
lang/smlnj/patches/patch-aq
+3 -1
View File
@@ -1,4 +1,6 @@
$NetBSD: patch-aq,v 1.2 2003/07/01 23:19:14 jtb Exp $
$NetBSD: patch-aq,v 1.3 2016/04/14 22:04:47 dholland Exp $
NetBSD support.
--- src/runtime/mach-dep/PPC.prim.asm.orig
+++ src/runtime/mach-dep/PPC.prim.asm
lang/smlnj/patches/patch-at
+26 -6
View File
@@ -1,11 +1,31 @@
$NetBSD: patch-at,v 1.2 2012/01/29 20:48:48 asau Exp $
$NetBSD: patch-at,v 1.3 2016/07/03 19:18:47 dholland Exp $
Don't unpack archive, since it is hard to fix,
unpack before patch phase instead.
- Honor the pkgsrc shell, to avoid getting a broken shell on e.g. Solaris.
- Don't use solaris make.
- Don't untar the runtime here since we did it from the pkgsrc makefile.
--- config/install.sh.orig 2007-06-12 20:43:58.000000000 +0400
+++ config/install.sh 2009-03-19 00:47:06.000000000 +0300
@@ -316,7 +316,7 @@
--- config/install.sh.orig 2011-05-16 21:13:32.000000000 +0000
+++ config/install.sh
@@ -55,7 +55,7 @@ cp config/preloads preloads.standard
#
MAKE=make
-SHELL=/bin/sh
+SHELL=@CONFIG_SHELL@
vsay $this: Using shell $SHELL.
#
@@ -291,7 +291,8 @@ esac
case $OPSYS in
solaris)
- MAKE=/usr/ccs/bin/make
+ # not in pkgsrc!
+ #MAKE=/usr/ccs/bin/make
;;
linux)
EXTRA_DEFS=`"$CONFIGDIR/chk-global-names.sh"`
@@ -335,7 +336,7 @@ BOOT_FILES=sml.$BOOT_ARCHIVE
if [ -x "$RUNDIR"/run.$ARCH-$OPSYS ]; then
vsay $this: Run-time system already exists.
else
lang/smlnj/patches/patch-base_runtime_objs_mk.x86-netbsd
-23
View File
@@ -1,23 +0,0 @@
$NetBSD: patch-base_runtime_objs_mk.x86-netbsd,v 1.1 2015/04/22 07:41:38 dholland Exp $
--- base/runtime/objs/mk.x86-netbsd.orig 2015-04-22 07:11:37.000000000 +0000
+++ base/runtime/objs/mk.x86-netbsd
@@ -7,9 +7,10 @@ SHELL = /bin/sh
MAKE = gmake
+AS = as --32
ARFLAGS = Trcv
CC = gcc -ansi
-CFLAGS = -O2
+CFLAGS = -O2 -m32
CPP = gcc -x assembler-with-cpp -E -P
#CPP = /usr/bin/cpp -P
@@ -23,4 +24,5 @@ VERSION = v-x86-netbsd
RUNTIME = run.x86-netbsd
all:
- ($(MAKE) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME))
+ echo '************************** schnozzbort ************************'
+ ($(MAKE) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" MAKE="$(MAKE)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME))
lang/smlnj/patches/patch-config___arch-n-opsys
+3 -1
View File
@@ -1,4 +1,6 @@
$NetBSD: patch-config___arch-n-opsys,v 1.1 2015/04/22 07:41:38 dholland Exp $
$NetBSD: patch-config___arch-n-opsys,v 1.2 2016/04/14 22:04:47 dholland Exp $
Learn about x86_64.
--- config/_arch-n-opsys~ 2011-03-22 13:30:14.000000000 +0000
+++ config/_arch-n-opsys
lang/smlnj/patches/patch-src_runtime_c-libs_posix-filesys_stat.c
+40
View File
@@ -0,0 +1,40 @@
$NetBSD: patch-src_runtime_c-libs_posix-filesys_stat.c,v 1.1 2016/07/03 19:35:13 dholland Exp $
Be explicit about truncating times, and avoid compiler warning.
--- src/runtime/c-libs/posix-filesys/stat.c~ 2000-06-01 18:34:03.000000000 +0000
+++ src/runtime/c-libs/posix-filesys/stat.c
@@ -3,6 +3,7 @@
* COPYRIGHT (c) 1995 by AT&T Bell Laboratories.
*/
+#include <stdint.h>
#include "ml-unixdep.h"
#include <sys/types.h>
#include <sys/stat.h>
@@ -34,6 +35,7 @@
PVT ml_val_t mkStatRep (ml_state_t *msp, struct stat *buf)
{
int ftype;
+ int32_t tmp;
ml_val_t mode, ino, dev, uid, gid, nlink, sr, atime, mtime, ctime;
#if ((S_IFDIR != 0x4000) || (S_IFCHR != 0x2000) || (S_IFBLK != 0x6000) || (S_IFREG != 0x8000) || (S_IFIFO != 0x1000) || (S_IFLNK != 0xA000) || (S_IFSOCK != 0xC000))
@@ -59,9 +61,14 @@ PVT ml_val_t mkStatRep (ml_state_t *msp,
WORD_ALLOC (msp, nlink, (Word_t)(buf->st_nlink));
WORD_ALLOC (msp, uid, (Word_t)(buf->st_uid));
WORD_ALLOC (msp, gid, (Word_t)(buf->st_gid));
- INT32_ALLOC (msp, atime, buf->st_atime);
- INT32_ALLOC (msp, mtime, buf->st_mtime);
- INT32_ALLOC (msp, ctime, buf->st_ctime);
+
+ /* XXX y2038 */
+ tmp = buf->st_atime;
+ INT32_ALLOC (msp, atime, tmp);
+ tmp = buf->st_mtime;
+ INT32_ALLOC (msp, mtime, tmp);
+ tmp = buf->st_ctime;
+ INT32_ALLOC (msp, ctime, tmp);
/* allocate the stat record */
ML_AllocWrite(msp, 0, MAKE_DESC(11, DTAG_record));
lang/smlnj/patches/patch-src_runtime_c-libs_posix-filesys_stat__64.c
+41
View File
@@ -0,0 +1,41 @@
$NetBSD: patch-src_runtime_c-libs_posix-filesys_stat__64.c,v 1.1 2016/07/03 19:35:13 dholland Exp $
Be explicit about truncating times, and avoid compiler warning.
--- src/runtime/c-libs/posix-filesys/stat_64.c.orig 2004-11-24 20:27:30.000000000 +0000
+++ src/runtime/c-libs/posix-filesys/stat_64.c
@@ -4,6 +4,8 @@
*
* Copyright (c) 2004 by The Fellowship of SML/NJ
*/
+
+#include <stdint.h>
#include "ml-unixdep.h"
#include <sys/types.h>
#include <sys/stat.h>
@@ -36,6 +38,7 @@
PVT ml_val_t mkStatRep (ml_state_t *msp, struct stat *buf)
{
int ftype;
+ int32_t tmp;
ml_val_t mode, ino, dev, uid, gid, nlink, sr, atime, mtime, ctime,
szhi, szlo;
@@ -68,9 +71,14 @@ PVT ml_val_t mkStatRep (ml_state_t *msp,
WORD_ALLOC (msp, szhi, (Word_t)0);
}
WORD_ALLOC (msp, szlo, (Word_t)(buf->st_size));
- INT32_ALLOC (msp, atime, buf->st_atime);
- INT32_ALLOC (msp, mtime, buf->st_mtime);
- INT32_ALLOC (msp, ctime, buf->st_ctime);
+
+ /* XXX y2038 */
+ tmp = buf->st_atime;
+ INT32_ALLOC (msp, atime, tmp);
+ tmp = buf->st_mtime;
+ INT32_ALLOC (msp, mtime, tmp);
+ tmp = buf->st_ctime;
+ INT32_ALLOC (msp, ctime, tmp);
/* allocate the stat record */
ML_AllocWrite(msp, 0, MAKE_DESC(12, DTAG_record));
lang/smlnj/patches/patch-src_runtime_c-libs_posix-procenv_time.c
+30
View File
@@ -0,0 +1,30 @@
$NetBSD: patch-src_runtime_c-libs_posix-procenv_time.c,v 1.1 2016/07/03 19:35:13 dholland Exp $
Be explicit about truncating times, and avoid compiler warning.
--- src/runtime/c-libs/posix-procenv/time.c~ 2000-06-01 18:34:03.000000000 +0000
+++ src/runtime/c-libs/posix-procenv/time.c
@@ -3,6 +3,7 @@
* COPYRIGHT (c) 1995 by AT&T Bell Laboratories.
*/
+#include <stdint.h>
#include "ml-base.h"
#include "ml-values.h"
#include "ml-objects.h"
@@ -17,11 +18,14 @@
ml_val_t _ml_P_ProcEnv_time (ml_state_t *msp, ml_val_t arg)
{
time_t t;
+ int32_t tt;
ml_val_t res;
t = time (NIL(time_t*));
- INT32_ALLOC(msp, res, t);
+ /* XXX y2038 */
+ tt = t;
+ INT32_ALLOC(msp, res, tt);
return res;
} /* end of _ml_P_ProcEnv_time */
lang/smlnj/patches/patch-src_runtime_c-libs_smlnj-date_mktime.c
+29
View File
@@ -0,0 +1,29 @@
$NetBSD: patch-src_runtime_c-libs_smlnj-date_mktime.c,v 1.1 2016/07/03 19:35:13 dholland Exp $
Use standard headers.
Be explicit about truncating times, and avoid compiler warning.
--- src/runtime/c-libs/smlnj-date/mktime.c~ 2007-06-01 16:19:33.000000000 +0000
+++ src/runtime/c-libs/smlnj-date/mktime.c
@@ -3,6 +3,8 @@
* COPYRIGHT (c) 1995 AT&T Bell Laboratories.
*/
+#include <string.h>
+#include <stdint.h>
#include <time.h>
#include "ml-base.h"
#include "ml-c.h"
@@ -40,8 +41,11 @@ ml_val_t _ml_Date_mktime (ml_state_t *ms
}
else {
ml_val_t res;
+ /* XXX y2038 */
+ int32_t tt;
- INT32_ALLOC(msp, res, t);
+ tt = t;
+ INT32_ALLOC(msp, res, tt);
return res;
}
lang/smlnj/patches/patch-src_runtime_c-libs_smlnj-runtime_gc-ctl.c
+14
View File
@@ -0,0 +1,14 @@
$NetBSD: patch-src_runtime_c-libs_smlnj-runtime_gc-ctl.c,v 1.1 2016/07/03 19:35:13 dholland Exp $
Use standard headers.
--- src/runtime/c-libs/smlnj-runtime/gc-ctl.c~ 2005-05-05 16:25:12.000000000 +0000
+++ src/runtime/c-libs/smlnj-runtime/gc-ctl.c
@@ -5,6 +5,7 @@
* General interface for GC control functions.
*/
+#include <string.h>
#include "ml-base.h"
#include "ml-values.h"
#include "ml-state.h"
lang/smlnj/patches/patch-src_runtime_gc_c-globals-tbl.c
+14
View File
@@ -0,0 +1,14 @@
$NetBSD: patch-src_runtime_gc_c-globals-tbl.c,v 1.1 2016/07/03 19:35:13 dholland Exp $
Use standard headers.
--- src/runtime/gc/c-globals-tbl.c~ 2000-06-01 18:34:03.000000000 +0000
+++ src/runtime/gc/c-globals-tbl.c
@@ -6,6 +6,7 @@
* in the ML heap (e.g., references to C functions).
*/
+#include <string.h>
#include "ml-base.h"
#include "tags.h"
#include "ml-values.h"
lang/smlnj/patches/patch-src_runtime_gc_gc-stats.h
+44
View File
@@ -0,0 +1,44 @@
$NetBSD: patch-src_runtime_gc_gc-stats.h,v 1.1 2016/04/14 21:58:22 dholland Exp $
Use struct timeval instead of blithely assuming that some private
struct declaration is always bit compatible with it. (Because it
isn't.) From PR 40954.
--- src/runtime/gc/gc-stats.h.orig 2009-03-03 18:23:38.000000000 -0500
+++ src/runtime/gc/gc-stats.h 2009-03-03 18:25:04.000000000 -0500
@@ -16,6 +16,7 @@ extern void ReportVM (ml_state_t *msp, i
#define START_GC_PAUSE(HEAP) { \
if (StatsOn) { \
+ struct timeval tv; \
heap_t *__heap = (HEAP); \
stat_rec_t *__p = &(StatsBuf[NStatsRecs]); \
Unsigned32_t __n = (Addr_t)(msp->ml_allocPtr) - \
@@ -23,7 +24,10 @@ extern void ReportVM (ml_state_t *msp, i
CNTR_INCR(&(__heap->numAlloc), __n); \
__p->allocCnt = __heap->numAlloc; \
__p->numGens = 0; \
- gettimeofday(&(__p->startTime), NIL(struct timezone *)); \
+ gettimeofday(&tv, NIL(struct timezone *)); \
+ /* XXX breaks in 2038 */ \
+ __p->startTime.seconds = tv.tv_sec; \
+ __p->startTime.uSeconds = tv.tv_usec; \
} \
}
@@ -34,8 +38,11 @@ extern void ReportVM (ml_state_t *msp, i
#define STOP_GC_PAUSE() { \
if (StatsOn) { \
- gettimeofday(&(StatsBuf[NStatsRecs].stopTime), \
- NIL(struct timezone *)); \
+ struct timeval tv; \
+ gettimeofday(&tv, NIL(struct timezone *)); \
+ /* XXX breaks in 2038 */ \
+ StatsBuf[NStatsRecs].stopTime.seconds = tv.tv_sec; \
+ StatsBuf[NStatsRecs].stopTime.uSeconds = tv.tv_usec; \
STATS_FINISH(); \
} \
}
lang/smlnj/patches/patch-src_runtime_gc_heap-out-util.c
+14
View File
@@ -0,0 +1,14 @@
$NetBSD: patch-src_runtime_gc_heap-out-util.c,v 1.1 2016/07/03 19:35:13 dholland Exp $
Use standard headers.
--- src/runtime/gc/heap-out-util.c~ 2000-06-01 18:34:03.000000000 +0000
+++ src/runtime/gc/heap-out-util.c
@@ -5,6 +5,7 @@
* Utility routines to export (or blast) an ML heap image.
*/
+#include <string.h>
#include "ml-base.h"
#include "heap.h"
#include "ml-values.h"
lang/smlnj/patches/patch-src_runtime_gc_init-gc.c
+27
View File
@@ -0,0 +1,27 @@
$NetBSD: patch-src_runtime_gc_init-gc.c,v 1.1 2016/04/14 21:58:22 dholland Exp $
Use struct timeval instead of blithely assuming that some private
struct declaration is always bit compatible with it. (Because it
isn't.) From PR 40954.
--- src/runtime/gc/init-gc.c.orig 2009-03-03 18:15:36.000000000 -0500
+++ src/runtime/gc/init-gc.c 2009-03-03 18:17:03.000000000 -0500
@@ -218,12 +218,16 @@ void InitHeap (ml_state_t *msp, bool_t i
#if defined(COLLECT_STATS)
if (StatsFD > 0) {
stat_hdr_t hdr;
+ struct timeval tv;
CNTR_ZERO(&(heap->numAlloc));
hdr.mask = STATMASK_ALLOC|STATMASK_NGENS|STATMASK_START|STATMASK_STOP;
hdr.isNewRuntime = 1;
hdr.allocSzB = params->allocSz;
hdr.numGens = params->numGens;
- gettimeofday (&(hdr.startTime), NIL(struct timezone *));
+ gettimeofday (&tv, NIL(struct timezone *));
+ /* XXX breaks in 2038 */
+ hdr.startTime.seconds = tv.tv_sec;
+ hdr.startTime.uSeconds = tv.tv_usec;
write (StatsFD, (char *)&hdr, sizeof(stat_hdr_t));
}
#endif
lang/smlnj/patches/patch-src_runtime_gc_mem-writer.c
+14
View File
@@ -0,0 +1,14 @@
$NetBSD: patch-src_runtime_gc_mem-writer.c,v 1.1 2016/07/03 19:35:13 dholland Exp $
Use standard headers.
--- src/runtime/gc/mem-writer.c~ 2000-06-01 18:34:03.000000000 +0000
+++ src/runtime/gc/mem-writer.c
@@ -5,6 +5,7 @@
* An implementation of the abstract writers on top of memory regions.
*/
+#include <string.h>
#include "ml-base.h"
#include "writer.h"
lang/smlnj/patches/patch-src_runtime_kernel_main.c
+14
View File
@@ -0,0 +1,14 @@
$NetBSD: patch-src_runtime_kernel_main.c,v 1.1 2016/07/03 19:35:13 dholland Exp $
Use standard headers.
--- src/runtime/kernel/main.c~ 2005-05-05 16:25:12.000000000 +0000
+++ src/runtime/kernel/main.c
@@ -6,6 +6,7 @@
*/
#include <stdio.h>
+#include <string.h>
#include <ctype.h>
#include "ml-base.h"
#include "ml-options.h"
lang/smlnj/patches/patch-src_runtime_kernel_unix-timers.c
+17
View File
@@ -0,0 +1,17 @@
$NetBSD: patch-src_runtime_kernel_unix-timers.c,v 1.1 2016/04/14 21:58:22 dholland Exp $
Don't blithely assume that some internal type has the same layout as a
system type. It doesn't. Same issue as PR 40954, but a new case that I
either didn't find at the time or has appeared since.
--- src/runtime/kernel/unix-timers.c~ 2000-06-01 18:34:03.000000000 +0000
+++ src/runtime/kernel/unix-timers.c
@@ -18,7 +18,7 @@ typedef struct rusage time_struct_t;
#define GET_TIME(t) getrusage(RUSAGE_SELF, &(t))
#define SYS_TIME(t) ((t).ru_stime)
#define USR_TIME(t) ((t).ru_utime)
-#define SET_TIME(tp, t) { *((struct timeval *)(tp)) = (t); }
+#define SET_TIME(tp, t) { (tp)->seconds = (t).tv_sec; (tp)->uSeconds = (t).tv_usec; }
#else /* !HAS_GETRUSAGE */
lang/smlnj/patches/patch-src_runtime_mach-dep_unix-prof.c
+15
View File
@@ -0,0 +1,15 @@
$NetBSD: patch-src_runtime_mach-dep_unix-prof.c,v 1.1 2016/04/14 21:58:22 dholland Exp $
Use own abstractions correctly.
--- src/runtime/mach-dep/unix-prof.c~ 2005-01-18 17:58:39.000000000 +0000
+++ src/runtime/mach-dep/unix-prof.c
@@ -34,7 +34,7 @@ void EnableProfSignals ()
*/
void DisableProfSignals ()
{
- SIG_SetHandler (SIGVTALRM, SIG_DFL);
+ SIG_SetDefault (SIGVTALRM);
} /* end of DisableProfSignals */
lang/smlnj/patches/patch-src_runtime_objs_mk.alpha32-dunix
+15
View File
@@ -0,0 +1,15 @@
$NetBSD: patch-src_runtime_objs_mk.alpha32-dunix,v 1.1 2016/07/03 19:29:27 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.alpha32-dunix~ 2000-06-01 18:34:03.000000000 +0000
+++ src/runtime/objs/mk.alpha32-dunix
@@ -6,7 +6,7 @@
SHELL = /bin/sh
CC = cc -std
-CFLAGS = -O
+CFLAGS = @CFLAGS@
LDFLAGS = -non_shared -T 20000000 -D 40000000
AS = as -nocpp
AR = /usr/ucb/ar
lang/smlnj/patches/patch-src_runtime_objs_mk.alpha32x-osf1
+15
View File
@@ -0,0 +1,15 @@
$NetBSD: patch-src_runtime_objs_mk.alpha32x-osf1,v 1.1 2016/07/03 19:29:27 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.alpha32x-osf1~ 2000-06-01 18:34:03.000000000 +0000
+++ src/runtime/objs/mk.alpha32x-osf1
@@ -4,7 +4,7 @@
SHELL = /bin/sh
CC = cc -std
-CFLAGS = -O
+CFLAGS = @CFLAGS@
LDFLAGS = -non_shared -T 20000000 -D 40000000
AS = as -nocpp
AR = /usr/ucb/ar
lang/smlnj/patches/patch-src_runtime_objs_mk.hppa-hpux
+15
View File
@@ -0,0 +1,15 @@
$NetBSD: patch-src_runtime_objs_mk.hppa-hpux,v 1.1 2016/07/03 19:29:27 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.hppa-hpux~ 2000-06-01 18:34:03.000000000 +0000
+++ src/runtime/objs/mk.hppa-hpux
@@ -12,7 +12,7 @@ CC = cc -Aa -N -D__STDC__
#CC = gcc -ansi -D__STDC__
CPP = /lib/cpp.ansi
-CFLAGS = -O
+CFLAGS = @CFLAGS@
AS = /usr/ccs/bin/as
RANLIB = ar ts
lang/smlnj/patches/patch-src_runtime_objs_mk.hppa-hpux11
+15
View File
@@ -0,0 +1,15 @@
$NetBSD: patch-src_runtime_objs_mk.hppa-hpux11,v 1.1 2016/07/03 19:29:27 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.hppa-hpux11~ 2005-07-20 14:30:18.000000000 +0000
+++ src/runtime/objs/mk.hppa-hpux11
@@ -13,7 +13,7 @@ CC = gcc -ansi -D__STDC__
#CPP = /lib/cpp.ansi
CPP = cpp
-CFLAGS = -O
+CFLAGS = @CFLAGS@
AS = /usr/ccs/bin/as
RANLIB = ar ts
lang/smlnj/patches/patch-src_runtime_objs_mk.hppa-hpux9
+15
View File
@@ -0,0 +1,15 @@
$NetBSD: patch-src_runtime_objs_mk.hppa-hpux9,v 1.1 2016/07/03 19:29:27 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.hppa-hpux9~ 2000-06-01 18:34:03.000000000 +0000
+++ src/runtime/objs/mk.hppa-hpux9
@@ -9,7 +9,7 @@ SHELL = /bin/sh
CC = cc -Aa -D__STDC__
CPP = /lib/cpp.ansi
-CFLAGS = -O
+CFLAGS = @CFLAGS@
AS = /bin/as
RANLIB = ar ts
lang/smlnj/patches/patch-src_runtime_objs_mk.ppc-aix
+15
View File
@@ -0,0 +1,15 @@
$NetBSD: patch-src_runtime_objs_mk.ppc-aix,v 1.1 2016/07/03 19:29:27 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.ppc-aix~ 2000-06-01 18:34:03.000000000 +0000
+++ src/runtime/objs/mk.ppc-aix
@@ -5,7 +5,7 @@ SHELL = /bin/sh
# note: the vendor cpp isn't expanding nested macro applications correctly.
CC = cc
-CFLAGS = -O2
+CFLAGS = @CFLAGS@
CPP = /lib/cpp
#CC = gcc -ansi
lang/smlnj/patches/patch-src_runtime_objs_mk.ppc-darwin
+15
View File
@@ -0,0 +1,15 @@
$NetBSD: patch-src_runtime_objs_mk.ppc-darwin,v 1.1 2016/07/03 19:29:27 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.ppc-darwin~ 2007-10-31 16:04:18.000000000 +0000
+++ src/runtime/objs/mk.ppc-darwin
@@ -11,7 +11,7 @@ SHELL = /bin/sh
MAKE = make
CC = cc -ansi
-CFLAGS = -g -O2 -D_NONSTD_SOURCE
+CFLAGS = @CFLAGS@ -D_NONSTD_SOURCE
CPP = cc -x assembler-with-cpp -E -P -ansi
XOBJS =
XLIBS = ../c-libs/dl/libunix-dynload.a
lang/smlnj/patches/patch-src_runtime_objs_mk.ppc-darwin5
+15
View File
@@ -0,0 +1,15 @@
$NetBSD: patch-src_runtime_objs_mk.ppc-darwin5,v 1.1 2016/07/03 19:29:27 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.ppc-darwin5~ 2002-10-10 17:08:59.000000000 +0000
+++ src/runtime/objs/mk.ppc-darwin5
@@ -9,7 +9,7 @@ SHELL = /bin/sh
MAKE = make
CC = cc -ansi
-CFLAGS = -g -O2
+CFLAGS = @CFLAGS@
CPP = cc -x assembler-with-cpp -E -P -ansi
XOBJS =
XLIBS =
lang/smlnj/patches/patch-src_runtime_objs_mk.ppc-linux
+15
View File
@@ -0,0 +1,15 @@
$NetBSD: patch-src_runtime_objs_mk.ppc-linux,v 1.1 2016/07/03 19:29:27 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.ppc-linux~ 2000-11-10 14:04:49.000000000 +0000
+++ src/runtime/objs/mk.ppc-linux
@@ -6,7 +6,7 @@ SHELL = /bin/sh
MAKE = make
CC = gcc -ansi
-CFLAGS = -O2
+CFLAGS = @CFLAGS@
CPP = gcc -x c -E -P -ansi
#XOBJS = xmonitor.o
#LD_LIBS = -lX11
lang/smlnj/patches/patch-src_runtime_objs_mk.x86-cygwin
+15
View File
@@ -0,0 +1,15 @@
$NetBSD: patch-src_runtime_objs_mk.x86-cygwin,v 1.1 2016/07/03 19:29:27 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.x86-cygwin~ 2004-03-19 18:54:52.000000000 +0000
+++ src/runtime/objs/mk.x86-cygwin
@@ -5,7 +5,7 @@ SHELL = /bin/sh
MAKE = make
CC = gcc
-CFLAGS = -O2
+CFLAGS = @CFLAGS@
CPP = gcc -x assembler-with-cpp -E -P
XOBJS =
XLIBS = ../c-libs/dl/libunix-dynload.a
lang/smlnj/patches/patch-src_runtime_objs_mk.x86-darwin
+15
View File
@@ -0,0 +1,15 @@
$NetBSD: patch-src_runtime_objs_mk.x86-darwin,v 1.1 2016/07/03 19:29:27 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.x86-darwin~ 2009-09-13 17:50:53.000000000 +0000
+++ src/runtime/objs/mk.x86-darwin
@@ -13,7 +13,7 @@ SHELL = /bin/sh
MAKE = make
AS = /usr/bin/as -arch i386
CC = cc -m32 -ansi
-CFLAGS = -g -O2 -D_DARWIN_C_SOURCE
+CFLAGS = @CFLAGS@ -D_DARWIN_C_SOURCE
CPP = cc -x assembler-with-cpp -E -P -ansi
XOBJS =
XLIBS = ../c-libs/dl/libunix-dynload.a
lang/smlnj/patches/patch-src_runtime_objs_mk.x86-freebsd
+15
View File
@@ -0,0 +1,15 @@
$NetBSD: patch-src_runtime_objs_mk.x86-freebsd,v 1.1 2016/07/03 19:29:27 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.x86-freebsd~ 2006-04-20 15:28:53.000000000 +0000
+++ src/runtime/objs/mk.x86-freebsd
@@ -9,7 +9,7 @@ MAKE = gmake
ARFLAGS = Trcv
CC = gcc -ansi
-CFLAGS = -O2
+CFLAGS = @CFLAGS@
CPP = gcc -x assembler-with-cpp -E -P
#CPP = /usr/bin/cpp -P
lang/smlnj/patches/patch-src_runtime_objs_mk.x86-linux
+15
View File
@@ -0,0 +1,15 @@
$NetBSD: patch-src_runtime_objs_mk.x86-linux,v 1.1 2016/07/03 19:29:27 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.x86-linux~ 2006-04-20 15:28:53.000000000 +0000
+++ src/runtime/objs/mk.x86-linux
@@ -6,7 +6,7 @@ SHELL = /bin/sh
MAKE = make
AS = as --32
CC = gcc -ansi
-CFLAGS = -O2 -m32
+CFLAGS = @CFLAGS@ -m32
CPP = gcc -x assembler-with-cpp -E -P
#XOBJS = xmonitor.o
#LD_LIBS = -lX11
lang/smlnj/patches/patch-src_runtime_objs_mk.x86-linux-pthreads
+15
View File
@@ -0,0 +1,15 @@
$NetBSD: patch-src_runtime_objs_mk.x86-linux-pthreads,v 1.1 2016/07/03 19:29:27 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.x86-linux-pthreads~ 2004-01-31 14:24:42.000000000 +0000
+++ src/runtime/objs/mk.x86-linux-pthreads
@@ -5,7 +5,7 @@ SHELL = /bin/sh
MAKE = make
CC = gcc -ansi
-CFLAGS = -O2 -D_REENTRANT
+CFLAGS = @CFLAGS@ -D_REENTRANT
CPP = gcc -x assembler-with-cpp -E -P
#XOBJS = xmonitor.o
#LD_LIBS = -lX11
lang/smlnj/patches/patch-src_runtime_objs_mk.x86-netbsd
+5 -4
View File
@@ -1,4 +1,6 @@
$NetBSD: patch-src_runtime_objs_mk.x86-netbsd,v 1.1 2015/04/22 07:41:38 dholland Exp $
$NetBSD: patch-src_runtime_objs_mk.x86-netbsd,v 1.3 2016/07/03 19:29:27 dholland Exp $
Configure for pkgsrc. Build as 32-bit.
--- src/runtime/objs/mk.x86-netbsd.orig 2015-04-22 07:11:37.000000000 +0000
+++ src/runtime/objs/mk.x86-netbsd
@@ -10,14 +12,13 @@ $NetBSD: patch-src_runtime_objs_mk.x86-netbsd,v 1.1 2015/04/22 07:41:38 dholland
ARFLAGS = Trcv
CC = gcc -ansi
-CFLAGS = -O2
+CFLAGS = -O2 -m32
+CFLAGS = @CFLAGS@ -m32
CPP = gcc -x assembler-with-cpp -E -P
#CPP = /usr/bin/cpp -P
@@ -23,4 +24,5 @@ VERSION = v-x86-netbsd
@@ -23,4 +24,4 @@ VERSION = v-x86-netbsd
RUNTIME = run.x86-netbsd
all:
- ($(MAKE) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME))
+ echo '************************** schnozzbort ************************'
+ ($(MAKE) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" MAKE="$(MAKE)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME))
lang/smlnj/patches/patch-src_runtime_objs_mk.x86-netbsd2
+15
View File
@@ -0,0 +1,15 @@
$NetBSD: patch-src_runtime_objs_mk.x86-netbsd2,v 1.1 2016/07/03 19:29:27 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.x86-netbsd2~ 2006-02-10 22:14:59.000000000 +0000
+++ src/runtime/objs/mk.x86-netbsd2
@@ -9,7 +9,7 @@ MAKE = gmake
ARFLAGS = Trcv
CC = gcc -ansi
-CFLAGS = -O2
+CFLAGS = @CFLAGS@
CPP = gcc -x assembler-with-cpp -E -P
#CPP = /usr/bin/cpp -P
lang/smlnj/patches/patch-src_runtime_objs_mk.x86-openbsd
+15
View File
@@ -0,0 +1,15 @@
$NetBSD: patch-src_runtime_objs_mk.x86-openbsd,v 1.1 2016/07/03 19:29:27 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.x86-openbsd~ 2008-12-02 16:50:18.000000000 +0000
+++ src/runtime/objs/mk.x86-openbsd
@@ -9,7 +9,7 @@ MAKE = gmake
ARFLAGS = Trcv
CC = gcc -ansi
-CFLAGS = -O2
+CFLAGS = @CFLAGS@
CPP = gcc -x assembler-with-cpp -E -P
#CPP = /usr/bin/cpp -P
lang/smlnj/patches/patch-src_runtime_objs_mk.x86-solaris
+15
View File
@@ -0,0 +1,15 @@
$NetBSD: patch-src_runtime_objs_mk.x86-solaris,v 1.1 2016/07/03 19:29:27 dholland Exp $
Honor pkgsrc CFLAGS.
--- src/runtime/objs/mk.x86-solaris~ 2004-01-31 14:24:42.000000000 +0000
+++ src/runtime/objs/mk.x86-solaris
@@ -12,7 +12,7 @@ AS = gas
AR = /usr/ccs/bin/ar
GCC = gcc
CC = $(GCC)
-CFLAGS = -O2
+CFLAGS = @CFLAGS@
CPP = gcc -x assembler-with-cpp -E -P
RANLIB = $(AR) ts