From owner-svn-ports-all@freebsd.org Sun Jul 7 07:38:43 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BCC2015DDF1F; Sun, 7 Jul 2019 07:38:42 +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 5B0BF716FC; Sun, 7 Jul 2019 07:38:42 +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 177C425C5B; Sun, 7 Jul 2019 07:38:42 +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 x677cfIn025914; Sun, 7 Jul 2019 07:38:41 GMT (envelope-from arrowd@FreeBSD.org) Received: (from arrowd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x677cfvF025913; Sun, 7 Jul 2019 07:38:41 GMT (envelope-from arrowd@FreeBSD.org) Message-Id: <201907070738.x677cfvF025913@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: arrowd set sender to arrowd@FreeBSD.org using -f From: Gleb Popov Date: Sun, 7 Jul 2019 07:38:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r506107 - head/lang/ghc X-SVN-Group: ports-head X-SVN-Commit-Author: arrowd X-SVN-Commit-Paths: head/lang/ghc X-SVN-Commit-Revision: 506107 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 5B0BF716FC X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.92 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.92)[-0.917,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:12874, ipnet:2000::/3, country:IT] 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: Sun, 07 Jul 2019 07:38:43 -0000 Author: arrowd Date: Sun Jul 7 07:38:41 2019 New Revision: 506107 URL: https://svnweb.freebsd.org/changeset/ports/506107 Log: lang/ghc: Makefile cleanup for tier2 arches. Submitted by: Mikael Urankar Differential Revision: https://reviews.freebsd.org/D20860 Modified: head/lang/ghc/Makefile Modified: head/lang/ghc/Makefile ============================================================================== --- head/lang/ghc/Makefile Sun Jul 7 06:47:25 2019 (r506106) +++ head/lang/ghc/Makefile Sun Jul 7 07:38:41 2019 (r506107) @@ -3,6 +3,7 @@ PORTNAME= ghc PORTVERSION= ${GHC_VERSION} +PORTREVISION= 1 CATEGORIES= lang haskell MASTER_SITES= https://www.haskell.org/ghc/dist/${PORTVERSION}/:source \ LOCAL/arrowd/:boot \ @@ -146,11 +147,8 @@ DISTFILES+= ghc-${BOOT_GHC_VERSION}-boot-${ARCH}-free # 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 +BUILD_DEPENDS+= llc${LLVM_VERSION}:devel/llvm${LLVM_VERSION} +RUN_DEPENDS+= llc${LLVM_VERSION}:devel/llvm${LLVM_VERSION} # When GHC being compiled and GHC used for bootstrapping support different # LLVM versions, we have to pull in both. Luckily, this is relatively rare. @@ -158,21 +156,16 @@ USE_GCC= yes BUILD_DEPENDS+= llc${BOOT_LLVM_VERSION}:devel/llvm${BOOT_LLVM_VERSION} RUN_DEPENDS+= llc${BOOT_LLVM_VERSION}:devel/llvm${BOOT_LLVM_VERSION} . endif - -. 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 -.if ${ARCH} == powerpc64 +.if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == powerpc64 USE_GCC= yes . if ${OSVERSION} < 1200086 -IGNORE= lang/ghc on powerpc64 requires at least __FreeBSD_version 1200086 +IGNORE= lang/ghc requires at least FreeBSD 12.0-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