Date: Sat, 28 Mar 2020 01:10:04 +0100 From: Piotr Kubaj <pkubaj@anongoth.pl> To: Gleb Popov <arrowd@freebsd.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r529272 - head/lang/ghc Message-ID: <20200328001004.GL12035@KGPE-D16> In-Reply-To: <CALH631=ZtiigYh4-UcEzaJxmtHUS6Eqpy%2BVs0R70WRoWRRcvSg@mail.gmail.com> References: <202003271745.02RHjcZR086273@repo.freebsd.org> <20200327175907.GK12035@KGPE-D16> <CALH631=ZtiigYh4-UcEzaJxmtHUS6Eqpy%2BVs0R70WRoWRRcvSg@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--20XocjIeMTCm4X0r Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline Well, I'm already preparing the bootstrap, but seeing that it's fixed now, I'm sure whether it's worth to update it. On 20-03-27 22:02:41, Gleb Popov wrote: >On Fri, Mar 27, 2020 at 9:59 PM Piotr Kubaj <pkubaj@anongoth.pl> wrote: > >> This commit will break GHC on powerpc64 elfv1, where it still uses >> 8.6.3 bootstrap. >> > >Oops, right, sorry. Should I add the conditional back, or you/mikael will >reroll bootstrap? > > >> On 20-03-27 17:45:38, Gleb Popov wrote: >> >Author: arrowd >> >Date: Fri Mar 27 17:45:38 2020 >> >New Revision: 529272 >> >URL: https://svnweb.freebsd.org/changeset/ports/529272 >> > >> >Log: >> > lang/ghc: Don't use GCC on ARM arches. Cleanup Makefile. >> > >> > PR: 245057 >> > Submitted by: mikael >> > >> >Modified: >> > head/lang/ghc/Makefile >> > >> >Modified: head/lang/ghc/Makefile >> >> >============================================================================== >> >--- head/lang/ghc/Makefile Fri Mar 27 17:31:08 2020 (r529271) >> >+++ head/lang/ghc/Makefile Fri Mar 27 17:45:38 2020 (r529272) >> >@@ -103,12 +103,7 @@ LLVM_VERSION= 60 >> > CONFIGURE_ARGS+= --enable-dtrace=0 >> > .endif >> > >> >-.if ${ARCH} == amd64 || ${ARCH} == i386 || (defined(PPC_ABI) && >> ${PPC_ABI} == ELFv2) >> > BOOT_GHC_VERSION= 8.6.5 >> >-.else >> >-BOOT_GHC_VERSION= 8.6.3 >> >-.endif >> >- >> > # LLVM version that bootstrap compiler uses >> > BOOT_LLVM_VERSION= 60 >> > >> >@@ -168,22 +163,15 @@ RUN_DEPENDS+= >> llc${BOOT_LLVM_VERSION}:devel/llvm${BOO >> > . endif >> > .endif >> > >> >-.if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 >> >-USE_GCC= yes >> >- >> >-. if ${OSVERSION} < 1200086 >> >-IGNORE= lang/ghc requires at least FreeBSD 12.0-RELEASE >> >+.if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 || >> ${ARCH} == powerpc64 >> >+. if ${OSVERSION} < 1201000 >> >+IGNORE= lang/ghc requires at least FreeBSD 12.1-RELEASE >> > . 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 >> > >> >-# Use binutils strip if we are using gcc, as it is faster that base one. >> See PR 234949 >> >-.if defined(USE_GCC) >> >-CONFIGURE_ENV+= STRIP=${LOCALBASE}/bin/strip >> >-.endif >> >- >> > PLIST_SUB+= GHC_VERSION=${GHC_VERSION} GHC_LIBDIR=${GHC_LIBDIR_REL} >> > >> > .if empty(PORT_OPTIONS:MBOOT) >> >@@ -233,12 +221,6 @@ post-patch: >> > 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 >> > >> --20XocjIeMTCm4X0r Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJkBAABCgBOFiEEycyIeNkkgohzsoorelmbhSCDnJ0FAl5+ldwwFIAAAAAAFQAS cGthLWFkZHJlc3NAZ251cGcub3JncGt1YmFqQGFub25nb3RoLnBsAAoJEHpZm4Ug g5ydyPkP/inDzvT3ce4i4KjQSgf573zv3fMkbLZOuaPZYGi8sDO60elbRVPUeS/T prl8cR7JHhT7m28XjLyltG96KmjW5wvrEEs2Hd2LhvZ9cUYD1dURMnapobqvj4B1 MJEUeiFMkHVU5eE4zpAnsC3OxY6L63OW+DqXOj5fYfIU0FTExm8/NWQaNI2t2Hrl 5+RONgsT8a3Jepq7UtBItgtwdB+fHWlP6ofTHQYlmrp3TUCClAqE8zVQc69wyGdh aaWfN1vhRMdqP/h4xyd2Lhfks8LWYpRGFbQEnYtAyh51ssYNAvr+I+5i0ZhRMdnm uLsZRYzK1z6AXsptotYrlA/zRFizducCvPZt6J7LIjayRzBtdxZGDjgL7nGcQM0f jMMMYSTJ6PjwyQ+Z2qW4q3FVa0zi6TE9i6N546WhzQmwwT4NxaacqFcR9SW4FeQx SvaXDjB+1YWvJyupEQSW223n5vKltb0Rp6G/OTzhrLKVBJB5mfDgDMCb1toR4VU1 eIeyg3Pgc3HHWL3HaJMt/do0RgvwU3eBociH5hVxwCYAVpD/VZhGDIwGtII1oyDX sicf5uXurko7TVAlyytkL+Q4uTe+JOW3jK7V4xKD67h+vKiu1tyRP9BaLpXql7rY Wy2ULAOFzYB9cmSzI0+PouSoUePDz9JBaKo8Qbkn5oLD0yFqbJhF =TTM+ -----END PGP SIGNATURE----- --20XocjIeMTCm4X0r--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20200328001004.GL12035>