From owner-svn-ports-all@freebsd.org Fri Mar 27 17:45:49 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 74DDC27C0EE; Fri, 27 Mar 2020 17:45:49 +0000 (UTC) (envelope-from arrowd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48pq5R3vCmz4DDg; Fri, 27 Mar 2020 17:45:47 +0000 (UTC) (envelope-from arrowd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4C06C25495; Fri, 27 Mar 2020 17:45:39 +0000 (UTC) (envelope-from arrowd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02RHjcvJ086274; Fri, 27 Mar 2020 17:45:38 GMT (envelope-from arrowd@FreeBSD.org) Received: (from arrowd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02RHjcZR086273; Fri, 27 Mar 2020 17:45:38 GMT (envelope-from arrowd@FreeBSD.org) Message-Id: <202003271745.02RHjcZR086273@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: arrowd set sender to arrowd@FreeBSD.org using -f From: Gleb Popov Date: Fri, 27 Mar 2020 17:45:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r529272 - head/lang/ghc X-SVN-Group: ports-head X-SVN-Commit-Author: arrowd X-SVN-Commit-Paths: head/lang/ghc X-SVN-Commit-Revision: 529272 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 17:45:49 -0000 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