Index: head/lang/Makefile =================================================================== --- head/lang/Makefile (revision 486977) +++ head/lang/Makefile (revision 486978) @@ -1,390 +1,391 @@ # $FreeBSD$ # COMMENT = Programming languages SUBDIR += Gofer SUBDIR += J SUBDIR += abcl SUBDIR += adacontrol SUBDIR += afnix SUBDIR += alchemist.el SUBDIR += algol68g SUBDIR += angelscript SUBDIR += arena SUBDIR += asis SUBDIR += asn1c SUBDIR += atlast SUBDIR += awka SUBDIR += bas2tap SUBDIR += basic256 SUBDIR += beignet SUBDIR += bf2c SUBDIR += bsh SUBDIR += bwbasic SUBDIR += c SUBDIR += cbmbasic SUBDIR += ccl SUBDIR += cdent SUBDIR += ceylon SUBDIR += cfortran SUBDIR += chaiscript SUBDIR += chez-scheme SUBDIR += chibi-scheme SUBDIR += chicken SUBDIR += chicken5 SUBDIR += cilkplus SUBDIR += cim SUBDIR += cint SUBDIR += cjs SUBDIR += clang-devel SUBDIR += clang35 SUBDIR += cling SUBDIR += clojure SUBDIR += clojure-mode.el SUBDIR += clover SUBDIR += cmucl SUBDIR += cmucl-extra SUBDIR += cocor SUBDIR += coffeescript SUBDIR += cparser SUBDIR += crystal SUBDIR += csharp-mode.el SUBDIR += cython SUBDIR += diveintopython SUBDIR += dlang-tools SUBDIR += dlv SUBDIR += dmd1 SUBDIR += dmd2 SUBDIR += duktape SUBDIR += duktape-lib SUBDIR += ecl SUBDIR += elan SUBDIR += elixir SUBDIR += elixir-mode.el SUBDIR += elk SUBDIR += emacs-lisp-intro SUBDIR += erlang SUBDIR += erlang-doc SUBDIR += erlang-java SUBDIR += erlang-riak SUBDIR += erlang-runtime15 SUBDIR += erlang-runtime16 SUBDIR += erlang-runtime17 SUBDIR += erlang-runtime18 SUBDIR += erlang-runtime19 SUBDIR += erlang-runtime20 SUBDIR += erlang-runtime21 SUBDIR += erlang-wx SUBDIR += execline SUBDIR += expect SUBDIR += f2c SUBDIR += fasm SUBDIR += ferite SUBDIR += ficl SUBDIR += fpc SUBDIR += fpc-base SUBDIR += fpc-docs SUBDIR += fpc-lua SUBDIR += fpc-rexx SUBDIR += fpc-rtl-console SUBDIR += fpc-rtl-extra SUBDIR += fpc-rtl-objpas SUBDIR += fpc-rtl-unicode SUBDIR += fpc-units SUBDIR += fpc-utils SUBDIR += fsharp SUBDIR += fth SUBDIR += gambit-c SUBDIR += gauche SUBDIR += gawk SUBDIR += gcc SUBDIR += gcc-ecj45 SUBDIR += gcc48 SUBDIR += gcc49 SUBDIR += gcc5 SUBDIR += gcc6 SUBDIR += gcc6-aux SUBDIR += gcc7 SUBDIR += gcc7-devel SUBDIR += gcc8 SUBDIR += gcc8-devel SUBDIR += gcc9-devel SUBDIR += gforth SUBDIR += ghc SUBDIR += ghc843 + SUBDIR += ghc862 SUBDIR += gjs SUBDIR += gnat_util SUBDIR += gnatcross-aarch64 SUBDIR += gnatcross-binutils-aarch64 SUBDIR += gnatcross-sysroot-aarch64 SUBDIR += gnatdroid-armv7 SUBDIR += gnatdroid-binutils SUBDIR += gnatdroid-binutils-x86 SUBDIR += gnatdroid-sysroot SUBDIR += gnatdroid-sysroot-x86 SUBDIR += gnatdroid-x86 SUBDIR += gnu-cobol SUBDIR += gnustep-base SUBDIR += go SUBDIR += go14 SUBDIR += gprolog SUBDIR += groovy SUBDIR += gscheme SUBDIR += guile SUBDIR += guile2 SUBDIR += harbour SUBDIR += haskell-mode.el SUBDIR += hla SUBDIR += hope SUBDIR += hs-brainfuck SUBDIR += hs-unlambda SUBDIR += huc SUBDIR += hugs SUBDIR += icc SUBDIR += ici SUBDIR += icon SUBDIR += intercal SUBDIR += io SUBDIR += io-devel SUBDIR += itcl SUBDIR += itcl4 SUBDIR += jakarta-commons-jelly SUBDIR += jimtcl SUBDIR += jruby SUBDIR += js_of_ocaml SUBDIR += julia SUBDIR += julia06 SUBDIR += julia07 SUBDIR += jython SUBDIR += kawa SUBDIR += kf5-kross SUBDIR += kross-interpreters SUBDIR += kturtle SUBDIR += kturtle-kde4 SUBDIR += lafontaine SUBDIR += lci SUBDIR += ldc SUBDIR += lfe SUBDIR += libhx SUBDIR += libobjc2 SUBDIR += librep SUBDIR += libstdc++_stldoc_4.2.2 SUBDIR += linux-c6-tcl85 SUBDIR += linux-c7-tcl85 SUBDIR += linux-dotnet-cli SUBDIR += linux-dotnet-runtime SUBDIR += linux-dotnet-sdk SUBDIR += linux-dotnet10-runtime SUBDIR += linux-dotnet11-runtime SUBDIR += linux-dotnet11-sdk SUBDIR += linux-j SUBDIR += lua-ada SUBDIR += lua51 SUBDIR += lua52 SUBDIR += lua53 SUBDIR += luajit SUBDIR += malbolge SUBDIR += maude SUBDIR += mawk SUBDIR += mdk SUBDIR += micropython SUBDIR += mit-scheme SUBDIR += mixal SUBDIR += mlton SUBDIR += mmix SUBDIR += modula3 SUBDIR += mono SUBDIR += mono-basic SUBDIR += mosh SUBDIR += mosml SUBDIR += mtasc SUBDIR += mujs SUBDIR += munger SUBDIR += myrddin SUBDIR += nawk SUBDIR += nbc SUBDIR += nbfc SUBDIR += neko SUBDIR += nesasm SUBDIR += newlisp SUBDIR += newlisp-devel SUBDIR += nhc98 SUBDIR += nickle SUBDIR += nim SUBDIR += nml SUBDIR += nqc SUBDIR += nwcc SUBDIR += nx SUBDIR += nyan SUBDIR += ocaml SUBDIR += ocaml-autoconf SUBDIR += ocaml-camlidl SUBDIR += ocaml-nox11 SUBDIR += ohugs SUBDIR += onyx SUBDIR += oo2c SUBDIR += opencoarrays SUBDIR += opendylan SUBDIR += ott SUBDIR += owl-lisp SUBDIR += p2c SUBDIR += p5-Data-JavaScript SUBDIR += p5-Error SUBDIR += p5-Expect SUBDIR += p5-ExtUtils-F77 SUBDIR += p5-Interpolation SUBDIR += p5-JSAN SUBDIR += p5-JavaScript-SpiderMonkey SUBDIR += p5-JavaScript-Squish SUBDIR += p5-JavaScript-Value-Escape SUBDIR += p5-List-MoreUtils SUBDIR += p5-List-MoreUtils-XS SUBDIR += p5-Marpa SUBDIR += p5-Marpa-PP SUBDIR += p5-Marpa-XS SUBDIR += p5-Modern-Perl SUBDIR += p5-Perl6-Subs SUBDIR += p5-Promises SUBDIR += p5-Pugs-Compiler-Rule SUBDIR += p5-Quantum-Superpositions SUBDIR += p5-Scalar-List-Utils SUBDIR += p5-Switch SUBDIR += p5-Tcl SUBDIR += p5-Test-XPath SUBDIR += p5-Try-Catch SUBDIR += p5-Try-Tiny SUBDIR += p5-Try-Tiny-Retry SUBDIR += p5-TryCatch SUBDIR += p5-ePerl SUBDIR += p5-signatures SUBDIR += p5-v6 SUBDIR += parrot SUBDIR += pbasic SUBDIR += pcc SUBDIR += pecl-perl SUBDIR += perl5-devel SUBDIR += perl5.24 SUBDIR += perl5.26 SUBDIR += perl5.28 SUBDIR += petite-chez SUBDIR += pfe SUBDIR += phantomjs SUBDIR += pharo SUBDIR += phc SUBDIR += php-mode.el SUBDIR += php56 SUBDIR += php56-extensions SUBDIR += php71 SUBDIR += php71-extensions SUBDIR += php72 SUBDIR += php72-extensions SUBDIR += php73 SUBDIR += php73-extensions SUBDIR += php_doc SUBDIR += picoc SUBDIR += pocl SUBDIR += polyml SUBDIR += ponyc SUBDIR += ptoc SUBDIR += pure SUBDIR += py-hy SUBDIR += py-mx-base SUBDIR += py-prolog SUBDIR += py-qt5-qml SUBDIR += pypy SUBDIR += pypy3 SUBDIR += python SUBDIR += python-doc-html SUBDIR += python-doc-pdf-a4 SUBDIR += python-doc-pdf-letter SUBDIR += python-doc-text SUBDIR += python-mode.el SUBDIR += python-tools SUBDIR += python2 SUBDIR += python27 SUBDIR += python3 SUBDIR += python34 SUBDIR += python35 SUBDIR += python36 SUBDIR += python37 SUBDIR += qore SUBDIR += qscheme SUBDIR += quack SUBDIR += racket SUBDIR += racket-minimal SUBDIR += ratfor SUBDIR += referenceassemblies-pcl SUBDIR += retro12 SUBDIR += rexx-imc SUBDIR += rexx-regina SUBDIR += rexx-regutil SUBDIR += rexx-wrapper SUBDIR += rhino SUBDIR += rubinius SUBDIR += ruby23 SUBDIR += ruby24 SUBDIR += ruby25 SUBDIR += runawk SUBDIR += rust SUBDIR += rust-nightly SUBDIR += sagittarius-scheme SUBDIR += sather-specification SUBDIR += sather-tutorial SUBDIR += sbcl SUBDIR += scala SUBDIR += scala-docs SUBDIR += scheme48 SUBDIR += scm SUBDIR += sdcc SUBDIR += see SUBDIR += seed7 SUBDIR += siod SUBDIR += sisc SUBDIR += sketchy SUBDIR += slib SUBDIR += slib-guile SUBDIR += slib-guile2 SUBDIR += slisp SUBDIR += smalltalk SUBDIR += smlnj SUBDIR += snobol4 SUBDIR += solidity SUBDIR += spidermonkey17 SUBDIR += spidermonkey170 SUBDIR += spidermonkey185 SUBDIR += spidermonkey24 SUBDIR += spidermonkey38 SUBDIR += spidermonkey52 SUBDIR += spl SUBDIR += squeak SUBDIR += squirrel SUBDIR += starlogo SUBDIR += stldoc SUBDIR += swi-pl SUBDIR += swift SUBDIR += tcbasic SUBDIR += tcc SUBDIR += tcl-manual SUBDIR += tcl-wrapper SUBDIR += tcl85 SUBDIR += tcl86 SUBDIR += tcl87 SUBDIR += tclX SUBDIR += tinypy SUBDIR += tolua SUBDIR += tolua++ SUBDIR += tuareg-mode.el SUBDIR += twelf SUBDIR += ucc SUBDIR += urweb SUBDIR += v8 SUBDIR += vala SUBDIR += visualworks SUBDIR += yabasic SUBDIR += yap SUBDIR += yap-devel SUBDIR += yorick SUBDIR += ypsilon .include Index: head/lang/ghc/bsd.ghc.mk =================================================================== --- head/lang/ghc/bsd.ghc.mk (revision 486977) +++ head/lang/ghc/bsd.ghc.mk (revision 486978) @@ -1,285 +1,298 @@ # $FreeBSD$ # # bsd.ghc.mk -- Common code for various versions of GHC ports. # # Maintained by: haskell@FreeBSD.org # ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 DATADIR= ${PREFIX}/share/ghc-${GHC_VERSION} EXAMPLESDIR= ${PREFIX}/share/examples/ghc-${GHC_VERSION} USES= autoreconf gmake iconv:translit localbase:ldflags ncurses perl5 tar:xz USE_LOCALE= en_US.UTF-8 USE_PERL5= build NO_CCACHE= ccache: error: Failed to create directory /nonexistent/.ccache/tmp: Permission denied # The configure process accepts,filters and canonicalises # the CONFIGURE_TARGET variable. You can read the files # ${WRKSRC}/configure and ${WRKSRC}/config.sub. # This is better fixed in files/build.mk.in GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-iconv-includes=${LOCALBASE}/include \ --with-iconv-libraries=${LOCALBASE}/lib # Turn off for a while, see PR 228727 CONFIGURE_ARGS+= --enable-dtrace=0 SUB_FILES= build.mk SUB_LIST= GHC_VERSION=${GHC_VERSION} \ NCURSESINC="${NCURSESBASE}/include" NCURSESLIB="${NCURSESLIB}" \ CFLAGS="${CFLAGS}" OPTIONS_GROUP= BOOTSTRAP BOOTSTRAP_DESC= Bootsrap using installed ghc OPTIONS_GROUP_BOOTSTRAP=BOOT OPTIONS_DEFINE= DYNAMIC GMP PROFILE DOCS OPTIONS_SUB= yes OPTIONS_DEFAULT= DYNAMIC PROFILE GMP BOOT_DESC= Use installed GHC for bootstrapping DOCS_DESC= Install HTML documentation DYNAMIC_DESC= Add support for dynamic linking GMP_DESC= Use GNU Multi-precision Library for big integers support PROFILE_DESC= Add support for performance profiling DOCS_BUILD_DEPENDS+= sphinx-build:textproc/py-sphinx DYNAMIC_CONFIGURE_WITH= system-libffi \ ffi-includes=${LOCALBASE}/include \ ffi-libraries=${LOCALBASE}/lib # The version number is needed as lang/gcc installs a different version DYNAMIC_LIB_DEPENDS= libffi.so.6:devel/libffi GMP_CONFIGURE_WITH= gmp-includes=${LOCALBASE}/include \ gmp-libraries=${LOCALBASE}/lib GMP_LIB_DEPENDS= libgmp.so:math/gmp # Append substitutions for build.mk BOOT_SUB_LIST= HSC2HS=${LOCALBASE}/bin/hsc2hs BOOT_SUB_LIST_OFF= HSC2HS=${BOOT_HSC2HS} DOCS_SUB_LIST= WITH_DOCS="YES" DOCS_SUB_LIST_OFF= WITH_DOCS="NO" DYNAMIC_SUB_LIST= WITH_DYNAMIC="YES" DYNAMIC_SUB_LIST_OFF= WITH_DYNAMIC="NO" GMP_SUB_LIST= INTEGER_LIBRARY="integer-gmp" GMP_SUB_LIST_OFF= INTEGER_LIBRARY="integer-simple" PROFILE_SUB_LIST= WITH_PROFILE="YES" PROFILE_SUB_LIST_OFF= WITH_PROFILE="NO" LOCALBASE?= /usr/local GHC_ARCH= ${ARCH:S/amd64/x86_64/:C/armv.*/arm/} .include .if empty(PORT_OPTIONS:MBOOT) . if ${ARCH} == armv6 || ${ARCH} == armv7 BOOT_GHC_VERSION= 8.4.2 . else BOOT_GHC_VERSION= 8.4.3 . endif + +# When GHC being compiled and GHC used for bootstrapping support different +# LLVM versions, we have to pull in both. Luckily, this is relatively rare. +. if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 +# LLVM version that bootstrap compiler uses +BOOT_LLVM_VERSION= 50 + +. if ${BOOT_LLVM_VERSION} != ${LLVM_VERSION} +BUILD_DEPENDS+= llc${BOOT_LLVM_VERSION}:devel/llvm${BOOT_LLVM_VERSION} +RUN_DEPENDS+= llc${BOOT_LLVM_VERSION}:devel/llvm${BOOT_LLVM_VERSION} +. endif +. endif + DISTFILES+= ghc-${BOOT_GHC_VERSION}-boot-${ARCH}-freebsd${EXTRACT_SUFX}:boot .endif # MBOOT .if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 # CONFIGURE_TARGET must to be the same as the llvm triple CONFIGURE_TARGET= ${ARCH}-unknown-freebsd${"${ARCH:Maarch64}" != "":?:-gnueabihf} EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-aclocal.m4 BUILD_DEPENDS+= ld.gold:devel/binutils \ llc${LLVM_VERSION}:devel/llvm${LLVM_VERSION} RUN_DEPENDS+= ld.gold:devel/binutils \ llc${LLVM_VERSION}:devel/llvm${LLVM_VERSION} USE_GCC= yes . if ${OSVERSION} < 1200064 IGNORE= lang/ghc on ARM requires at least __FreeBSD_version 1200064 . endif . ifdef QEMU_EMULATING IGNORE= qemu-user-static isn't able to build lang/ghc, but it builds fine on a real hardware . endif .endif CONFIGURE_ENV+= CC=${CC} LD=${LD} DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} GHC_LIBDIR= ${STAGEDIR}${PREFIX}/lib/ghc-${GHC_VERSION} GHC_LIBDIR_REL= lib/ghc-${GHC_VERSION} PLIST_SUB+= GHC_VERSION=${GHC_VERSION} GHC_LIBDIR=${GHC_LIBDIR_REL} HACKAGE_SITE?= http://hackage.haskell.org/package/ .if empty(PORT_OPTIONS:MBOOT) BOOT_DIR= ${WRKDIR}/ghc-${BOOT_GHC_VERSION}-boot BOOT_GHC= ${BOOT_DIR}/bin/ghc-${BOOT_GHC_VERSION} BOOT_GHC-PKG= ${BOOT_DIR}/bin/ghc-pkg-${BOOT_GHC_VERSION} BOOT_HSC2HS= ${BOOT_DIR}/bin/hsc2hs SLAVE_CMD= ${SETENV} PATH=${BOOT_DIR}/bin:${PATH} CONFIGURE_ARGS_BOOT+= --prefix=${BOOT_DIR} CONFIGURE_ARGS+= --with-ghc=${BOOT_GHC} .else # MBOOT SLAVE_CMD= # empty CONFIGURE_ARGS+= --with-ghc=${LOCALBASE}/bin/ghc .endif # MBOOT # override TMPDIR because /tmp often doesn't have enough space # to build some of the larger libraries. TMPDIR= ${WRKSRC}/tmp # Defining with documentation: # An in place installation and registration of hscolour will be # activated. In this way it's possible to use it directly into # the build tree, without needing to install it. At the end # you could view the output of: ${BOOT_GHC} describe hscolour SLAVES_PREFIX= ${WRKDIR}/slaves_prefix SLAVES_WRKDIRPREFIX= ${WRKDIR}/slaves_wrkdirprefix MAKE_ENV+= PATH=${SLAVES_PREFIX}/bin:${PATH} CONFIGURE_ENV+= PATH=${SLAVES_PREFIX}/bin:${PATH} post-extract: # don't use the "wrap" trick on arches that use post-ino64 bootstrap binaries (arm*) .if empty(PORT_OPTIONS:MBOOT) && ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200031 && \ ${ARCH} != aarch64 && ${ARCH} != armv6 && ${ARCH} != armv7 @${REINPLACE_CMD} -e 's|@SettingsCCompilerLinkFlags@|& -Wl,--wrap=readdir_r,--wrap=stat,--wrap=lstat,--wrap=fstat,--wrap=mknod|' ${BOOT_DIR}/settings.in .endif # %%PORTDOCS%%%%DOCSDIR%%/html/libraries/doc-index-V.html post-install-script: ${FIND} -ds ${GHC_LIBDIR} -type f -print | ${SED} -E \ -e 's,^${STAGEDIR}${PREFIX}/?,,' \ -e '/^${GHC_LIBDIR:C/\//\\\//g}\/package.conf.d\/package\.cache/s|^|@comment |g' \ >> ${TMPPLIST} ${FIND} -ds ${STAGEDIR}${DOCSDIR} -type f -print | ${SED} -E \ -e 's,^${STAGEDIR}${PREFIX}/?,,' \ -e '/^${STAGEDIR:C/\//\\\//g}${DOCSDIR:C/\//\\\//g}\/html\/libraries\/doc-index-[^.]+\.html/s|^|@comment |g' \ -e '/^${STAGEDIR:C/\//\\\//g}${DOCSDIR:C/\//\\\//g}\/html\/libraries\/index[^\/.]*\.html/s|^|@comment|g' \ -e '/^${STAGEDIR:C/\//\\\//g}${DOCSDIR:C/\//\\\//g}\/html\/libraries\/[^\/]+\.png/s|^|@comment |g' \ >> ${TMPPLIST} .if ${PORT_OPTIONS:MDOCS} # Cleanup the indexen created by gen_contents_index ${ECHO} "@postunexec ${RM} %D/${DOCSDIR_REL}/html/libraries/doc-index-*.html" >> ${TMPPLIST} ${ECHO} "@postunexec ${RM} %D/${DOCSDIR_REL}/html/libraries/index*.html" >> ${TMPPLIST} ${ECHO} "@postunexec ${RM} %D/${DOCSDIR_REL}/html/libraries/*.png" >> ${TMPPLIST} .endif ${ECHO} '@postunexec ${RM} %D/${GHC_LIBDIR_REL}/package.conf.d/package.cache' >>${TMPPLIST} ${ECHO} "@postexec %D/bin/ghc-pkg recache" >>${TMPPLIST} .if ${PORT_OPTIONS:MDOCS} ${ECHO} '@postexec ${SH} -c "cd %D/${DOCSDIR_REL}/html/libraries && ./gen_contents_index"' >> ${TMPPLIST} .endif post-patch: @${REINPLACE_CMD} -e 's|%%CC%%|${CC}|; \ s|%%AR%%|${AR}|; \ s|%%LD%%|${LD}|' \ ${WRKSRC}/libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs # we must use binutils:ld on arm .if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 @${REINPLACE_CMD} -e 's|LD_NO_GOLD=ld|LD_NO_GOLD=${LOCALBASE}/bin/ld|' \ ${WRKSRC}/aclocal.m4 .endif @${REINPLACE_CMD} -e 's/@SettingsLlcCommand@/llc${LLVM_VERSION}/' ${WRKSRC}/settings.in @${REINPLACE_CMD} -e 's/@SettingsOptCommand@/opt${LLVM_VERSION}/' ${WRKSRC}/settings.in .if empty(PORT_OPTIONS:MBOOT) @${REINPLACE_CMD} -e '/^mandir/d' ${BOOT_DIR}/mk/build.mk @${REINPLACE_CMD} -e '/^infodir/d' ${BOOT_DIR}/mk/build.mk @${REINPLACE_CMD} -e '/^docdir/d' ${BOOT_DIR}/mk/build.mk @${REINPLACE_CMD} -e '/^htmldir/d' ${BOOT_DIR}/mk/build.mk .endif pre-configure: apply-slist # Copy the subbed build.mk to the proper position ${CP} ${WRKDIR}/build.mk ${WRKSRC}/mk/build.mk @${MKDIR} ${TMPDIR} .if empty(PORT_OPTIONS:MBOOT) && ${OPSYS} == FreeBSD && \ ${OSVERSION} >= 1200031 && \ ${ARCH} != aarch64 && ${ARCH} != armv6 && ${ARCH} != armv7 ${CC} ${CFLAGS} -c -o ${BOOT_DIR}/wrap.o ${PATCHDIR}/wrap.c for x in ${BOOT_DIR}/rts/dist/build/libCffi*.a; do \ ${AR} q $$x ${BOOT_DIR}/wrap.o; ${RANLIB} $$x; \ done rm ${BOOT_DIR}/wrap.o .endif # Do not merge, prev condition need to grow OSVER check. .if empty(PORT_OPTIONS:MBOOT) @(cd ${BOOT_DIR} && ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${CONFIGURE_ARGS_BOOT}) @(cd ${BOOT_DIR} && PACKAGES='' ${MAKE_CMD} install) .endif .if ${PORT_OPTIONS:MDOCS} @${ECHO_MSG} -e "\a" @${ECHO_MSG} "======================================================================" @${ECHO_MSG} " WARNING: Now HsColour will be built, the respective port will not " @${ECHO_MSG} " be installed, but an in-place installation and " @${ECHO_MSG} " registration of both takes place. " @${ECHO_MSG} "======================================================================" @${ECHO_MSG} "" . if !(defined(PACKAGE_BUILDING) || defined(BATCH)) @sleep 3 . endif @${MKDIR} ${SLAVES_PREFIX} @${MKDIR} ${SLAVES_WRKDIRPREFIX} @(cd ${SLAVES_WRKDIRPREFIX} && \ ${TAR} xvf ${DISTDIR}/hscolour-${HSCOLOUR_VERSION}.tar.gz && \ cd hscolour-${HSCOLOUR_VERSION} && \ ${SLAVE_CMD} ghc --make -o Setup Setup.hs -package Cabal && \ ${SLAVE_CMD} ./Setup configure --ghc --prefix=${SLAVES_PREFIX} --with-gcc=${CC} --with-ld=${LD} && \ ${SLAVE_CMD} ./Setup build && \ ${SLAVE_CMD} ./Setup install) .endif _EXECUTABLES= ${GHC_LIBDIR}/bin/unlit \ ${GHC_LIBDIR}/bin/hpc \ ${GHC_LIBDIR}/bin/ghc-iserv \ ${GHC_LIBDIR}/bin/ghc-pkg \ ${GHC_LIBDIR}/bin/hsc2hs \ ${GHC_LIBDIR}/bin/runghc \ ${GHC_LIBDIR}/bin/ghc \ ${GHC_LIBDIR}/bin/hp2ps .if ${PORT_OPTIONS:MPROFILE} _EXECUTABLES+= ${GHC_LIBDIR}/bin/ghc-iserv-prof .endif .if ${PORT_OPTIONS:MDYNAMIC} _EXECUTABLES+= ${GHC_LIBDIR}/bin/ghc-iserv-dyn .endif .if ${PORT_OPTIONS:MDOCS} _EXECUTABLES+= ${GHC_LIBDIR}/bin/haddock .endif post-install: ${RM} ${STAGEDIR}${PREFIX}/bin/haddock .if ${PORT_OPTIONS:MDOCS} ${LN} -sf haddock-ghc-${GHC_VERSION} ${STAGEDIR}${PREFIX}/bin/haddock .endif (for f in ${_EXECUTABLES} $$(${FIND} ${GHC_LIBDIR} -name '*.so*'); do \ ${STRIP_CMD} $$f; done) # Create a bootstrap compiler tar ball: run this in an interactive poudriere jail .PHONY: create-bootstrap create-bootstrap: cd ${WRKSRC} \ && ${ECHO} "BIN_DIST_NAME=ghc-${GHC_VERSION}-boot" >> mk/build.mk \ && ${ECHO} "BIN_DIST_TAR=ghc-${GHC_VERSION}-boot.tar" >> mk/build.mk \ && gmake binary-dist TAR_COMP=xz \ && ${MV} ${WRKSRC}/ghc-${GHC_VERSION}-boot-${GHC_ARCH}-portbld-freebsd.tar.xz /tmp/ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz cd /tmp \ && sha256 ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz \ && ${ECHO} -n "SIZE (ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz) = " \ && ${STAT} -f %z ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz Index: head/lang/ghc862/Makefile =================================================================== --- head/lang/ghc862/Makefile (nonexistent) +++ head/lang/ghc862/Makefile (revision 486978) @@ -0,0 +1,31 @@ +# $FreeBSD$ + +PORTNAME= ghc +PORTVERSION= ${GHC_VERSION} +PKGNAMESUFFIX= 862 +CATEGORIES= lang haskell +MASTER_SITES= http://www.haskell.org/ghc/dist/${PORTVERSION}/:source \ + LOCAL/arrowd/:boot \ + ${HACKAGE_SITE}hscolour-${HSCOLOUR_VERSION}/:docs + +EXTRACT_ONLY= ${_DISTFILES:C/hscolour.*$//g} +DISTFILES= ghc-${PORTVERSION}-src${EXTRACT_SUFX}:source \ + hscolour-${HSCOLOUR_VERSION}.tar.gz:docs + +MAINTAINER= haskell@FreeBSD.org +COMMENT= Compiler for the functional language Haskell + +LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE + +GHC_VERSION= 8.6.2 +HSCOLOUR_VERSION= 1.24.4 +LLVM_VERSION= 60 + +CONFLICTS_INSTALL= ghc-7.4.* ghc-7.6.* ghc-7.8.* ghc-7.10.* ghc-8.0.* ghc-8.4.* + +PLIST= ${.CURDIR}/../../lang/ghc/pkg-plist + +.include "${.CURDIR}/../../lang/ghc/bsd.ghc.mk" + +.include Property changes on: head/lang/ghc862/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/lang/ghc862/distinfo =================================================================== --- head/lang/ghc862/distinfo (nonexistent) +++ head/lang/ghc862/distinfo (revision 486978) @@ -0,0 +1,15 @@ +TIMESTAMP = 1543568924 +SHA256 (ghc-8.6.2-src.tar.xz) = caaa819d21280ecde90a4773143dee188711e9ff175a27cfbaee56eb851d76d5 +SIZE (ghc-8.6.2-src.tar.xz) = 19024236 +SHA256 (ghc-8.4.3-boot-amd64-freebsd.tar.xz) = 0e0324a539d471a813ed4d18c537fb19be22a4e250bd5434a3a911b9d5343724 +SIZE (ghc-8.4.3-boot-amd64-freebsd.tar.xz) = 67718400 +SHA256 (ghc-8.4.3-boot-i386-freebsd.tar.xz) = 65fcd48b1c0166e028b3f6d50ad295525e6b84490da82663ec66165e57e87972 +SIZE (ghc-8.4.3-boot-i386-freebsd.tar.xz) = 66143592 +SHA256 (hscolour-1.24.4.tar.gz) = 243332b082294117f37b2c2c68079fa61af68b36223b3fc07594f245e0e5321d +SIZE (hscolour-1.24.4.tar.gz) = 28729 +SHA256 (ghc-8.4.2-boot-aarch64-freebsd.tar.xz) = 18412f10bb172dbaff7f31505845fbd43fdde14046463fdacc42e26683be311d +SIZE (ghc-8.4.2-boot-aarch64-freebsd.tar.xz) = 100240140 +SHA256 (ghc-8.4.2-boot-armv6-freebsd.tar.xz) = 61d3a4486dbb904b05a735e98f23a49c2b464d6b19212dd655ff578f36d02f0d +SIZE (ghc-8.4.2-boot-armv6-freebsd.tar.xz) = 107368936 +SHA256 (ghc-8.4.2-boot-armv7-freebsd.tar.xz) = eedb9416870bfe82315155751871e31e815b718b381ccf4f7e45a99a6ad7c94d +SIZE (ghc-8.4.2-boot-armv7-freebsd.tar.xz) = 110153548 Property changes on: head/lang/ghc862/distinfo ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/lang/ghc862/files/extra-patch-aclocal.m4 =================================================================== --- head/lang/ghc862/files/extra-patch-aclocal.m4 (nonexistent) +++ head/lang/ghc862/files/extra-patch-aclocal.m4 (revision 486978) @@ -0,0 +1,16 @@ +--- aclocal.m4.orig 2018-03-25 21:22:32 UTC ++++ aclocal.m4 +@@ -2361,13 +2378,6 @@ AC_DEFUN([FIND_LD],[ + [enable_ld_override=yes]) + + find_ld() { +- # Make sure the user didn't specify LD manually. +- if test "z$LD" != "z"; then +- AC_CHECK_TARGET_TOOL([LD], [ld]) +- LD_NO_GOLD=$LD +- return +- fi +- + # Manually iterate over possible names since we want to ensure that, e.g., + # if ld.lld is installed but gcc doesn't support -fuse-ld=lld, that we + # then still try ld.gold and -fuse-ld=gold. Property changes on: head/lang/ghc862/files/extra-patch-aclocal.m4 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/lang/ghc862/files/patch-ghc.mk =================================================================== --- head/lang/ghc862/files/patch-ghc.mk (nonexistent) +++ head/lang/ghc862/files/patch-ghc.mk (revision 486978) @@ -0,0 +1,20 @@ +--- ghc.mk.orig 2018-09-16 20:53:54 UTC ++++ ghc.mk +@@ -96,6 +96,7 @@ endif + # Catch make if it runs away into an infinite loop + ifeq "$(MAKE_RESTARTS)" "" + else ifeq "$(MAKE_RESTARTS)" "1" ++else ifeq "$(MAKE_RESTARTS)" "2" + else + $(error Make has restarted itself $(MAKE_RESTARTS) times; is there a makefile bug? See http://ghc.haskell.org/trac/ghc/wiki/Building/Troubleshooting#Makehasrestarteditself3timesisthereamakefilebug for details) + endif +@@ -461,9 +462,7 @@ PACKAGES_STAGE1 += template-haskell + PACKAGES_STAGE1 += ghc-compact + PACKAGES_STAGE1 += ghc-heap + +-ifeq "$(HADDOCK_DOCS)" "YES" + PACKAGES_STAGE1 += xhtml +-endif + + ifeq "$(WITH_TERMINFO)" "YES" + PACKAGES_STAGE1 += terminfo Property changes on: head/lang/ghc862/files/patch-ghc.mk ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/lang/ghc862/files/build.mk.in =================================================================== --- head/lang/ghc862/files/build.mk.in (nonexistent) +++ head/lang/ghc862/files/build.mk.in (revision 486978) @@ -0,0 +1,20 @@ +docdir = %%PREFIX%%/share/doc/ghc-%%GHC_VERSION%% +htmldir = %%PREFIX%%/share/doc/ghc-%%GHC_VERSION%% +mandir = %%PREFIX%%/man +infodir = %%PREFIX%%/info +DYNAMIC_GHC_PROGRAMS = %%WITH_DYNAMIC%% +BUILD_PROF_LIBS = %%WITH_PROFILE%% +HADDOCK_DOCS = %%WITH_DOCS%% +HSCOLOUR_SRCS = %%WITH_DOCS%% +INTEGER_LIBRARY = %%INTEGER_LIBRARY%% +# disable xelatex: PR 231438 +BUILD_SPHINX_PDF = NO +BSD_PATH_TO_HSC2HS = %%HSC2HS%% +SRC_HC_OPTS += -I%%NCURSESINC%% -L%%NCURSESLIB%% -I%%LOCALBASE%%/include -L%%LOCALBASE%%/lib +SRC_CC_OPTS += %%CFLAGS%% +EXTRA_HSC2HS_OPTS += -I%%LOCALBASE%%/include --lflag=-L%%LOCALBASE%%/lib +EXTRA_LD_OPTS += -L%%LOCALBASE%%/lib +EXTRA_CABAL_CONFIGURE_FLAGS += --extra-include-dirs=%%LOCALBASE%%/include +EXTRA_CABAL_CONFIGURE_FLAGS += --extra-lib-dirs=%%LOCALBASE%%/lib +libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes=%%NCURSESINC%% --configure-option=--with-curses-libraries=%%NCURSESLIB%% +V = 0 Property changes on: head/lang/ghc862/files/build.mk.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/lang/ghc862/files/patch-configure.ac =================================================================== --- head/lang/ghc862/files/patch-configure.ac (nonexistent) +++ head/lang/ghc862/files/patch-configure.ac (revision 486978) @@ -0,0 +1,12 @@ +--- configure.ac.orig 2018-04-17 19:30:22 UTC ++++ configure.ac +@@ -447,6 +447,9 @@ XCODE_VERSION() + dnl ** Building a cross compiler? + dnl -------------------------------------------------------------- + CrossCompiling=NO ++ ++build=`echo $build | sed -e 's/amd64-/x86_64-/g; s/armv[[67]]-/arm-/g; s/-freebsd.*$/-freebsd/g'` ++ + # If 'host' and 'target' differ, then this means we are building a cross-compiler. + if test "$TargetPlatform" != "$HostPlatform" ; then + CrossCompiling=YES Property changes on: head/lang/ghc862/files/patch-configure.ac ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/lang/ghc862/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs =================================================================== --- head/lang/ghc862/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs (nonexistent) +++ head/lang/ghc862/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs (revision 486978) @@ -0,0 +1,39 @@ +--- libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs.orig 2017-11-28 16:40:34 UTC ++++ libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs +@@ -59,6 +59,8 @@ import Distribution.Compat.Exception + import Distribution.Verbosity + import Distribution.Version + ++import System.FilePath (takeDirectory) ++ + import qualified Data.Map as Map + + -- ------------------------------------------------------------ +@@ -265,11 +267,13 @@ alexProgram = (simpleProgram "alex") { + + gccProgram :: Program + gccProgram = (simpleProgram "gcc") { +- programFindVersion = findProgramVersion "-dumpversion" id +- } ++ programFindLocation = \v p -> findProgramOnSearchPath v p "%%CC%%" ++} + + arProgram :: Program +-arProgram = simpleProgram "ar" ++arProgram = (simpleProgram "ar") { ++ programFindLocation = \v p -> findProgramOnSearchPath v p "%%AR%%" ++} + + stripProgram :: Program + stripProgram = (simpleProgram "strip") { +@@ -337,7 +341,9 @@ greencardProgram :: Program + greencardProgram = simpleProgram "greencard" + + ldProgram :: Program +-ldProgram = simpleProgram "ld" ++ldProgram = (simpleProgram "ld") { ++ programFindLocation = \v p -> findProgramOnSearchPath v p "%%LD%%" ++ } + + tarProgram :: Program + tarProgram = (simpleProgram "tar") { Property changes on: head/lang/ghc862/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/lang/ghc862/files/wrap.c =================================================================== --- head/lang/ghc862/files/wrap.c (nonexistent) +++ head/lang/ghc862/files/wrap.c (revision 486978) @@ -0,0 +1,55 @@ +/* -*- ugly-hack-mode -*- */ +/* $FreeBSD$ */ + +#include + +struct old_dirent; +struct old_stat; + +__asm(".symver old_readdir_r, readdir_r@FBSD_1.0"); +int old_readdir_r(void *dirp, struct old_dirent *entry, + struct old_dirent **result); +__asm(".symver old_stat, stat@FBSD_1.0"); +int old_stat(const char * restrict path, struct old_stat * restrict sb); +__asm(".symver old_lstat, lstat@FBSD_1.0"); +int old_lstat(const char * restrict path, struct old_stat * restrict sb); +__asm(".symver old_fstat, fstat@FBSD_1.0"); +int old_fstat(int fd, struct old_stat *sb); +__asm(".symver old_mknod, mknod@FBSD_1.0"); +int old_mknod(const char *path, mode_t mode, uint32_t dev); + +int +__wrap_readdir_r(void *dirp, struct old_dirent *entry, + struct old_dirent **result) +{ + + return (old_readdir_r(dirp, entry, result)); +} + +int +__wrap_stat(const char * restrict path, struct old_stat * restrict sb) +{ + + return (old_stat(path, sb)); +} + +int +__wrap_lstat(const char * restrict path, struct old_stat * restrict sb) +{ + + return (old_lstat(path, sb)); +} + +int +__wrap_fstat(int fd, struct old_stat *sb) +{ + + return (old_fstat(fd, sb)); +} + +int +__wrap_mknod(const char *path, mode_t mode, uint32_t dev) +{ + + return (old_mknod(path, mode, dev)); +} Property changes on: head/lang/ghc862/files/wrap.c ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/lang/ghc862/pkg-descr =================================================================== --- head/lang/ghc862/pkg-descr (nonexistent) +++ head/lang/ghc862/pkg-descr (revision 486978) @@ -0,0 +1,20 @@ +The Glasgow Haskell Compiler is a state-of-the-art, open source, compiler and +interactive environment for the functional language Haskell. Highlights: + + * Supports the entire Haskell 2010 language plus a wide variety of + extensions. + * Has particularly good support for concurrency and parallelism, including + support for Software Transactional Memory (STM). + * Generates fast code, particularly for concurrent programs. + * Works on several platforms including FreeBSD, Windows, Mac, Linux, most + varieties of Unix, and several different processor architectures. + * Has extensive optimisation capabilities, including inter-module optimisation. + * Compiles Haskell code either directly to native code or using LLVM as a + back-end. It can also generate C code as an intermediate target for porting + to new platforms. The interactive environment compiles Haskell to bytecode, + and supports execution of mixed bytecode/compiled programs. + * Profiling is supported, both by time/allocation and various kinds of heap + profiling. + * Comes with several libraries, and thousands more are available on Hackage. + +WWW: http://www.haskell.org/ghc/ Property changes on: head/lang/ghc862/pkg-descr ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property