From owner-svn-ports-all@freebsd.org Fri Mar 27 18:03:30 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EEB9427CA08; Fri, 27 Mar 2020 18:03:30 +0000 (UTC) (envelope-from 6yearold@gmail.com) Received: from mail-lj1-f175.google.com (mail-lj1-f175.google.com [209.85.208.175]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48pqTf544xz4LGP; Fri, 27 Mar 2020 18:03:17 +0000 (UTC) (envelope-from 6yearold@gmail.com) Received: by mail-lj1-f175.google.com with SMTP id 19so11131554ljj.7; Fri, 27 Mar 2020 11:03:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=7wle4Fk5vJeApQKdLaZW8A0Mu5EqPnbSkqsOH66CLt0=; b=C/NLwy8DHoUTWRPWyOHGxPlCeGBEsS6XeafjzYKMkkoKeSh3ynT+Mncqto+c5JwVDM PB7OmB3IPliCODSzqBBUqbjZV/aahSmXeFCWMusCexXyyUdinyQAXgD812i1s6efuDyY wqlSibDjhMldhoCv1A2HfTLCUw3lp2m80G1RpRHE0pHfd6a2iNP8odiVFYAfG6vj1APn UVkFRiQZgJ4IQXV48UMFes8f9myM3daja4KYVL5jkCPdo9CKI+tdHQIceS0bmJkl0LXa mG9129DqdPGlhAIyMzfeGR3e3zBpQuCZ6uqC0cee6SBw0cey4T2TepSk5E5wYazHoGLy cD1w== X-Gm-Message-State: AGi0PubesIc5TSFsa7rSNo285l1XtmpFjh3iJXNKFupVcJC++nutRjq6 X6dOhfQsga9T84VoupGVRQ/n1+NPMa9lAQ== X-Google-Smtp-Source: APiQypI5/zOAvCzW0mv3bM+wUvfLPS1Aaw3ZnpzAbwxzywU1MVp6jneKe9G1HP1J6jpnzWCACCB80A== X-Received: by 2002:a2e:b801:: with SMTP id u1mr120412ljo.84.1585332187514; Fri, 27 Mar 2020 11:03:07 -0700 (PDT) Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com. [209.85.167.45]) by smtp.gmail.com with ESMTPSA id e20sm3143144ljn.107.2020.03.27.11.03.06 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 27 Mar 2020 11:03:06 -0700 (PDT) Received: by mail-lf1-f45.google.com with SMTP id t16so7793916lfl.2; Fri, 27 Mar 2020 11:03:06 -0700 (PDT) X-Received: by 2002:ac2:4110:: with SMTP id b16mr300415lfi.211.1585332185856; Fri, 27 Mar 2020 11:03:05 -0700 (PDT) MIME-Version: 1.0 References: <202003271745.02RHjcZR086273@repo.freebsd.org> <20200327175907.GK12035@KGPE-D16> In-Reply-To: <20200327175907.GK12035@KGPE-D16> From: Gleb Popov Date: Fri, 27 Mar 2020 22:02:41 +0400 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r529272 - head/lang/ghc To: Piotr Kubaj Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-Rspamd-Queue-Id: 48pqTf544xz4LGP X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of 6yearold@gmail.com designates 209.85.208.175 as permitted sender) smtp.mailfrom=6yearold@gmail.com X-Spamd-Result: default: False [-2.40 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; DMARC_NA(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; TO_DN_SOME(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[175.208.85.209.list.dnswl.org : 127.0.5.0]; IP_SCORE(-0.41)[ip: (-0.40), ipnet: 209.85.128.0/17(-1.11), asn: 15169(-0.47), country: US(-0.05)]; FORGED_SENDER(0.30)[arrowd@freebsd.org,6yearold@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[175.208.85.209.rep.mailspike.net : 127.0.0.17]; MIME_TRACE(0.00)[0:+,1:+,2:~]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[arrowd@freebsd.org,6yearold@gmail.com] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Mar 2020 18:03:31 -0000 On Fri, Mar 27, 2020 at 9:59 PM Piotr Kubaj 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 > > >