From owner-svn-ports-head@freebsd.org Thu Mar 26 18:33:31 2020 Return-Path: Delivered-To: svn-ports-head@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 BD9EC2A64CA; Thu, 26 Mar 2020 18:33:31 +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 48pDBx2c3mz4KKZ; Thu, 26 Mar 2020 18:33:29 +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 F0984AD6B; Thu, 26 Mar 2020 18:33:21 +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 02QIXLkE051357; Thu, 26 Mar 2020 18:33:21 GMT (envelope-from arrowd@FreeBSD.org) Received: (from arrowd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02QIXLL8051354; Thu, 26 Mar 2020 18:33:21 GMT (envelope-from arrowd@FreeBSD.org) Message-Id: <202003261833.02QIXLL8051354@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: arrowd set sender to arrowd@FreeBSD.org using -f From: Gleb Popov Date: Thu, 26 Mar 2020 18:33:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r529205 - in head/lang/ghc: . files X-SVN-Group: ports-head X-SVN-Commit-Author: arrowd X-SVN-Commit-Paths: in head/lang/ghc: . files X-SVN-Commit-Revision: 529205 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Mar 2020 18:33:32 -0000 Author: arrowd Date: Thu Mar 26 18:33:20 2020 New Revision: 529205 URL: https://svnweb.freebsd.org/changeset/ports/529205 Log: Update bootstraps for ARM architectures, get rid of GCC on powerpc64 elfv2/ PR: 245057 Submitted by: pkubaj, mikael Added: head/lang/ghc/files/patch-utils_iserv_ghc.mk (contents, props changed) Modified: head/lang/ghc/Makefile head/lang/ghc/distinfo Modified: head/lang/ghc/Makefile ============================================================================== --- head/lang/ghc/Makefile Thu Mar 26 18:26:49 2020 (r529204) +++ head/lang/ghc/Makefile Thu Mar 26 18:33:20 2020 (r529205) @@ -3,7 +3,7 @@ PORTNAME= ghc PORTVERSION= ${GHC_VERSION} -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= lang haskell MASTER_SITES= https://www.haskell.org/ghc/dist/${PORTVERSION}/:source \ LOCAL/arrowd/:boot \ @@ -21,7 +21,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE # other supported arches are added based on GHC_VERSION below ONLY_FOR_ARCHS= amd64 i386 -USES= autoreconf gmake iconv:translit localbase:ldflags ncurses perl5 tar:xz +USES= autoreconf compiler:c11 gmake iconv:translit \ + localbase:ldflags ncurses perl5 tar:xz USE_LOCALE= en_US.UTF-8 USE_PERL5= build GNU_CONFIGURE= yes @@ -167,7 +168,7 @@ RUN_DEPENDS+= llc${BOOT_LLVM_VERSION}:devel/llvm${BOO . endif .endif -.if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == powerpc64 +.if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 USE_GCC= yes . if ${OSVERSION} < 1200086 Modified: head/lang/ghc/distinfo ============================================================================== --- head/lang/ghc/distinfo Thu Mar 26 18:26:49 2020 (r529204) +++ head/lang/ghc/distinfo Thu Mar 26 18:33:20 2020 (r529205) @@ -19,14 +19,14 @@ SHA256 (ghc-8.6.5-boot-amd64-freebsd11.tar.xz) = 07d4c SIZE (ghc-8.6.5-boot-amd64-freebsd11.tar.xz) = 68965716 SHA256 (ghc-8.6.5-boot-i386-freebsd11.tar.xz) = cd208fbb6b2a158ff8c5d6227e0babd8c224867ea301abf970dc446f04c9e95f SIZE (ghc-8.6.5-boot-i386-freebsd11.tar.xz) = 67439136 -SHA256 (ghc-8.6.3-boot-aarch64-freebsd.tar.xz) = 5a1f043ada7262cf4eac4a900b7d5af965e5f6f89939e635ad0c10b0185a15b7 -SIZE (ghc-8.6.3-boot-aarch64-freebsd.tar.xz) = 104631584 -SHA256 (ghc-8.6.3-boot-armv6-freebsd.tar.xz) = 5260987646c9f6102f35a7cdedfde785227c4f317fb3ccc52d06cae6a0950a68 -SIZE (ghc-8.6.3-boot-armv6-freebsd.tar.xz) = 113748008 -SHA256 (ghc-8.6.3-boot-armv7-freebsd.tar.xz) = 765d01199ceb0dfa5c84de692cec427e67ae1cf1ba6e1fc20e7ca854c6ceb556 -SIZE (ghc-8.6.3-boot-armv7-freebsd.tar.xz) = 114046668 -SHA256 (ghc-8.6.5-boot-powerpc64-freebsd-elfv2.tar.xz) = 89dfbfab84aef489ca9d0ff6fdf97152cff2412f6a8b9b1e57025b2019908318 -SIZE (ghc-8.6.5-boot-powerpc64-freebsd-elfv2.tar.xz) = 113782560 +SHA256 (ghc-8.6.5-boot-aarch64-freebsd.tar.xz) = 63d461161c87132a3c3d3683c4995f4209e139fe719a25e551a600412c11aa3e +SIZE (ghc-8.6.5-boot-aarch64-freebsd.tar.xz) = 136306580 +SHA256 (ghc-8.6.5-boot-armv6-freebsd.tar.xz) = 1fe5f4f5d1bfec5d45b0f92101b5be818b221c730655a4f1b31ecbb8382b7108 +SIZE (ghc-8.6.5-boot-armv6-freebsd.tar.xz) = 136889664 +SHA256 (ghc-8.6.5-boot-armv7-freebsd.tar.xz) = ce4bc7fd20bb420963081171e483beb7387f9704323f7c03e36bbf3bf68a00ea +SIZE (ghc-8.6.5-boot-armv7-freebsd.tar.xz) = 135237856 +SHA256 (ghc-8.6.5-boot-powerpc64-freebsd-elfv2.tar.xz) = 58eb128409a69b1b19f92b3c4090b6a023fd22f539b8b8013a7b6bf4b264d916 +SIZE (ghc-8.6.5-boot-powerpc64-freebsd-elfv2.tar.xz) = 112469852 SHA256 (ghc-8.6.3-boot-powerpc64-freebsd-elfv1.tar.xz) = fb9bd4bad3a54722b7012c0a531cbdfe71b3b20a0b92cbd52195a526dc5ccde4 SIZE (ghc-8.6.3-boot-powerpc64-freebsd-elfv1.tar.xz) = 112652192 SHA256 (hscolour-1.24.4.tar.gz) = 243332b082294117f37b2c2c68079fa61af68b36223b3fc07594f245e0e5321d Added: head/lang/ghc/files/patch-utils_iserv_ghc.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/ghc/files/patch-utils_iserv_ghc.mk Thu Mar 26 18:33:20 2020 (r529205) @@ -0,0 +1,11 @@ +--- utils/iserv/ghc.mk.orig 2020-03-23 22:25:01 UTC ++++ utils/iserv/ghc.mk +@@ -31,7 +31,7 @@ endif + # of overhead to startup and increases the binary sizes) but if you + # need it there's no alternative. + ifeq "$(TargetElf)" "YES" +-ifneq "$(TargetOS_CPP)" "solaris2" ++ifeq "$(findstring $(TargetOS_CPP), solaris2 freebsd)" "" + # The Solaris linker does not support --export-dynamic option. It also + # does not need it since it exports all dynamic symbols by default + utils/iserv_stage2_MORE_HC_OPTS += -optl-Wl,--export-dynamic