From owner-dev-commits-ports-all@freebsd.org Sat Apr 17 18:30:51 2021 Return-Path: Delivered-To: dev-commits-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 B14435DF527; Sat, 17 Apr 2021 18:30:51 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FN1qH4ZWkz3Ck8; Sat, 17 Apr 2021 18:30:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 855C11D135; Sat, 17 Apr 2021 18:30:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13HIUpLn000125; Sat, 17 Apr 2021 18:30:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13HIUpqN000124; Sat, 17 Apr 2021 18:30:51 GMT (envelope-from git) Date: Sat, 17 Apr 2021 18:30:51 GMT Message-Id: <202104171830.13HIUpqN000124@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 71f5c297a769 - main - devel/avr-gcc: Put variables in order and format Makefile MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 71f5c297a769da5c7d6ab1b13d97b9a6be7d668c Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Apr 2021 18:30:51 -0000 The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/ports/commit/?id=71f5c297a769da5c7d6ab1b13d97b9a6be7d668c commit 71f5c297a769da5c7d6ab1b13d97b9a6be7d668c Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2021-04-17 17:52:59 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2021-04-17 18:30:59 +0000 devel/avr-gcc: Put variables in order and format Makefile Approved by: portmgr blanket --- devel/avr-gcc/Makefile | 51 +++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/devel/avr-gcc/Makefile b/devel/avr-gcc/Makefile index d30fad7948b2..03aa4d4c08ba 100644 --- a/devel/avr-gcc/Makefile +++ b/devel/avr-gcc/Makefile @@ -11,51 +11,52 @@ COMMENT= FSF GCC for Atmel AVR 8-bit RISC cross-development LICENSE= GPLv3 GPLv3RLE LICENSE_COMB= multi -BROKEN_mips64= Fails to configure: cannot compute suffix of object files +BROKEN_mips64= Fails to configure: cannot compute suffix of object files BUILD_DEPENDS= avr-as:devel/binutils@avr \ avr-ld:devel/binutils@avr \ objdump:devel/binutils -LIB_DEPENDS= libmpfr.so:math/mpfr \ - libgmp.so:math/gmp \ +LIB_DEPENDS= libgmp.so:math/gmp \ + libisl.so:devel/isl \ libmpc.so:math/mpc \ - libisl.so:devel/isl + libmpfr.so:math/mpfr RUN_DEPENDS= avr-as:devel/binutils@avr \ avr-ld:devel/binutils@avr USES= bison compiler:c++11-lang gmake iconv libtool localbase \ makeinfo perl5 tar:xz - -# DIST_VERSION relates to downloads, GCC_VERSION and SUFFIX to names -# of executables and directories once installed. A PORTVERSION of -# 4.Y.2.s20130808 results in values of 4.Y-20130808, 4.Y.2, and 4Y -# for these three. -DIST_VERSION= ${PORTVERSION:C/([0-9]+\.[0-9]+).*\.s([0-9]+)/\1-\2/} -GCC_VERSION= ${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/} -SUFFIX= ${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/} - -USE_PERL5= build -GNU_CONFIGURE= yes -MAKE_JOBS_UNSAFE= yes - -CONFLICTS= avr-gcc-devel* - USE_CXXSTD= gnu++03 +USE_LDCONFIG= ${PREFIX}/lib/gcci/avr/${SUFFIX} +USE_PERL5= build -CONFIGURE_ARGS= --target=avr --disable-libssp --with-gmp=${LOCALBASE} --enable-languages="c c++" \ +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-libssp \ + --enable-languages="c c++" \ + --target=avr \ + --with-gmp=${LOCALBASE} \ --with-isl=${LOCALBASE} -USE_LDCONFIG= ${PREFIX}/lib/gcci/avr/${SUFFIX} +MAKE_JOBS_UNSAFE= yes + +WITHOUT_CPU_CFLAGS= This is a cross-compiler. -WITHOUT_CPU_CFLAGS=This is a cross-compiler. +CONFLICTS= avr-gcc-devel* INFO= cpp gcc gccint cppinternals gccinstall -OPTIONS_DEFINE= NLS -OPTIONS_SUB= yes -NLS_USES= gettext +OPTIONS_DEFINE= NLS +OPTIONS_SUB= yes +NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls +# DIST_VERSION relates to downloads, GCC_VERSION and SUFFIX to names +# of executables and directories once installed. A PORTVERSION of +# 4.Y.2.s20130808 results in values of 4.Y-20130808, 4.Y.2, and 4Y +# for these three. +DIST_VERSION= ${PORTVERSION:C/([0-9]+\.[0-9]+).*\.s([0-9]+)/\1-\2/} +GCC_VERSION= ${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/} +SUFFIX= ${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/} + .include .if (${ARCH} == "amd64")