Fri Sep 16 19:53:44 2022 UTC ()
lang/smlnj11072: remove no longer needed powerpc nlffi section.

This now caused the build to fail, and the build and install
now succeeds on NetBSD/macppc.


(he)
diff -r1.12 -r1.13 pkgsrc/lang/smlnj11072/Makefile
cvs diff -r1.12 -r1.13 pkgsrc/lang/smlnj11072/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/smlnj11072/Makefile 2020/01/26 17:31:32 1.12
+++ pkgsrc/lang/smlnj11072/Makefile 2022/09/16 19:53:44 1.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.12 2020/01/26 17:31:32 rillig Exp $ 1# $NetBSD: Makefile,v 1.13 2022/09/16 19:53:44 he Exp $
2# 2#
3 3
4DISTNAME= boot.${BOX}-unix 4DISTNAME= boot.${BOX}-unix
5PKGNAME= smlnj-${SML_VERSION} 5PKGNAME= smlnj-${SML_VERSION}
6PKGREVISION= 1 6PKGREVISION= 1
7CATEGORIES= lang 7CATEGORIES= lang
8MASTER_SITES= http://smlnj.cs.uchicago.edu/dist/working/${SML_VERSION}/ 8MASTER_SITES= http://smlnj.cs.uchicago.edu/dist/working/${SML_VERSION}/
9DISTFILES= MLRISC.tgz \ 9DISTFILES= MLRISC.tgz \
10 boot.${BOX}-unix.tgz \ 10 boot.${BOX}-unix.tgz \
11 ckit.tgz \ 11 ckit.tgz \
12 cm.tgz \ 12 cm.tgz \
13 cml.tgz \ 13 cml.tgz \
14 compiler.tgz \ 14 compiler.tgz \
@@ -89,40 +89,26 @@ do-extract: @@ -89,40 +89,26 @@ do-extract:
89 export extract_file; \ 89 export extract_file; \
90 cd ${WRKDIR}/src; ${EXTRACT_CMD} 90 cd ${WRKDIR}/src; ${EXTRACT_CMD}
91 91
92# symlink the rest of the distfiles 92# symlink the rest of the distfiles
93# also copy in new configs 93# also copy in new configs
94post-extract: 94post-extract:
95 cd ${WRKDIR} && ${LN} -sf ${_DISTDIR}/* . 95 cd ${WRKDIR} && ${LN} -sf ${_DISTDIR}/* .
96 cp ${FILESDIR}/mk.* ${WRKDIR}/src/runtime/objs/ 96 cp ${FILESDIR}/mk.* ${WRKDIR}/src/runtime/objs/
97 97
98# make the necessary copy of the runtime, _after_ patching src 98# make the necessary copy of the runtime, _after_ patching src
99post-patch: 99post-patch:
100 cd ${WRKDIR}/src && pax -rw runtime ${WRKDIR}/base/ 100 cd ${WRKDIR}/src && pax -rw runtime ${WRKDIR}/base/
101 101
102# Turn of nlffi on powerpc (I guess it doesn't work?) 
103# 
104# XXX: this switch doesn't work any more as the line in question doesn't 
105# exist in the current version. Someone with a PPC build machine, 
106# please check it out and either change it to match the file if still 
107# needed, or get rid of it. 
108.if ${MACHINE_ARCH} == "powerpc" 
109SUBST_CLASSES+= nlffi 
110SUBST_STAGE.nlffi= pre-configure 
111SUBST_MESSAGE.nlffi= Turning off nlffi 
112SUBST_FILES.nlffi= config/targets 
113SUBST_SED.nlffi= -e '/^request nlffi$$/d' 
114.endif # powerpc 
115 
116# resolve definition of SML_BASE 102# resolve definition of SML_BASE
117SUBST_CLASSES+= smlbase 103SUBST_CLASSES+= smlbase
118SUBST_STAGE.smlbase= pre-configure 104SUBST_STAGE.smlbase= pre-configure
119SUBST_MESSAGE.smlbase= Setting SML_BASE 105SUBST_MESSAGE.smlbase= Setting SML_BASE
120SUBST_FILES.smlbase= ${SML_SCRIPTS:S/^/config\//} 106SUBST_FILES.smlbase= ${SML_SCRIPTS:S/^/config\//}
121SUBST_VARS.smlbase= SML_BASE 107SUBST_VARS.smlbase= SML_BASE
122 108
123# resolve definition of CFLAGS in patched files 109# resolve definition of CFLAGS in patched files
124# (note that we need to do this in both src/runtime and base/runtime) 110# (note that we need to do this in both src/runtime and base/runtime)
125SUBST_CLASSES+= cflags 111SUBST_CLASSES+= cflags
126SUBST_STAGE.cflags= pre-configure 112SUBST_STAGE.cflags= pre-configure
127SUBST_MESSAGE.cflags= Setting CFLAGS 113SUBST_MESSAGE.cflags= Setting CFLAGS
128SUBST_FILES.cflags= src/runtime/objs/* base/runtime/objs/* 114SUBST_FILES.cflags= src/runtime/objs/* base/runtime/objs/*