From owner-svn-ports-all@freebsd.org Wed Nov 27 19:55:15 2019 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 019D71B680A; Wed, 27 Nov 2019 19:55:15 +0000 (UTC) (envelope-from pkubaj@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 47NWhf6D7Tz4V8v; Wed, 27 Nov 2019 19:55:14 +0000 (UTC) (envelope-from pkubaj@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 B88DD1A836; Wed, 27 Nov 2019 19:55:14 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xARJtEOP089774; Wed, 27 Nov 2019 19:55:14 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xARJtEeX089771; Wed, 27 Nov 2019 19:55:14 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <201911271955.xARJtEeX089771@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Wed, 27 Nov 2019 19:55:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r518529 - in head/lang/nim: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: in head/lang/nim: . files X-SVN-Commit-Revision: 518529 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: Wed, 27 Nov 2019 19:55:15 -0000 Author: pkubaj Date: Wed Nov 27 19:55:14 2019 New Revision: 518529 URL: https://svnweb.freebsd.org/changeset/ports/518529 Log: lang/nim: Remove BROKEN for powerpc64 Fix build on powerpc64 elfv1 and elfv2. PR: 241974 Submitted by: hamiltcl@verizon.net Approved by: ports@nicandneal.net (maintainer), tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D22568 Added: head/lang/nim/files/elfv1-patch-build.sh (contents, props changed) Modified: head/lang/nim/Makefile Modified: head/lang/nim/Makefile ============================================================================== --- head/lang/nim/Makefile Wed Nov 27 19:47:30 2019 (r518528) +++ head/lang/nim/Makefile Wed Nov 27 19:55:14 2019 (r518529) @@ -16,7 +16,6 @@ BROKEN_aarch64= fails to compile: crt1.c: undefined r BROKEN_armv6= fails to compile: crt1.c: undefined reference to main BROKEN_armv7= fails to compile: crt1.c: undefined reference to main BROKEN_mips64= fails to build: build.sh: clang: not found -BROKEN_powerpc64= fails to build: build.sh: clang: not found BROKEN_sparc64= fails to build: build.sh: clang: not found TOOLS_DESC= Build and install nimgrep and nimsuggest @@ -31,9 +30,15 @@ USES= compiler tar:xz TLIST= nimgrep nimsuggest +.if ${ARCH} == "powerpc64" +. if defined(PPC_ABI) && ${PPC_ABI} == ELFv1 +EXTRA_PATCHES= ${PATCHDIR}/elfv1-patch-build.sh +. endif +.endif + post-patch: -.if ${COMPILER_TYPE} == clang - @${REINPLACE_CMD} -e '/cc =/s/gcc/clang/' ${WRKSRC}/config/nim.cfg +.if defined(PPC_ABI) && ${PPC_ABI} == ELFv1 + @${REINPLACE_CMD} -e '/cc =/s/clang/gcc/' ${WRKSRC}/config/nim.cfg .endif do-build: Added: head/lang/nim/files/elfv1-patch-build.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/nim/files/elfv1-patch-build.sh Wed Nov 27 19:55:14 2019 (r518529) @@ -0,0 +1,15 @@ +--- build.sh.orig 2019-10-24 12:53:39 UTC ++++ build.sh +@@ -84,7 +84,11 @@ + ;; + *freebsd* ) + myos="freebsd" +- CC="clang" ++ if [ "$ucpu" = "powerpc" ] ; then ++ CC="gcc" ++ else ++ CC="clang" ++ fi + LINK_FLAGS="$LINK_FLAGS -lm" + ;; + *openbsd* )