Date: Mon, 16 Mar 2015 01:04:15 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r381368 - head/Mk/Uses Message-ID: <201503160104.t2G14F73050170@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Mon Mar 16 01:04:14 2015 New Revision: 381368 URL: https://svnweb.freebsd.org/changeset/ports/381368 QAT: https://qat.redports.org/buildarchive/r381368/ Log: Mk/Uses/ada.mk: Add gcc5-based Ada compiler support A new argument has been added to USES=ada, "5", which will select the gcc5-aux compiler (gcc 5) instead of the gcc-aux compiler (gcc 4.9). Additionally, it will check if ADA_DEFAULT is defined and equal to "5". If that is the case, gcc5-aux will be used by default, even if no arguments are defined. The use case is to define it in make.conf so that all Ada ports are built with same compiler. This capability will be used to confirm all Ada ports build correctly with gcc5-aux before the default compiler is switched. Modified: head/Mk/Uses/ada.mk Modified: head/Mk/Uses/ada.mk ============================================================================== --- head/Mk/Uses/ada.mk Mon Mar 16 01:03:36 2015 (r381367) +++ head/Mk/Uses/ada.mk Mon Mar 16 01:04:14 2015 (r381368) @@ -1,10 +1,12 @@ # $FreeBSD$ # # Establish Ada-capable compiler as a build dependency +# To change default compiler, define ADA_DEFAULT in make.conf to 5 +# Note that gcc47-aux is being removed soon, so 47 is not a legal default # # Feature: ada # Usage: USES=ada -# Valid ARGS: 47 +# Valid ARGS: 47, 5 # # MAINTAINER: marino@FreeBSD.org @@ -13,17 +15,22 @@ _INCLUDE_USES_ADA_MK= yes CC= ada -. if ${ada_ARGS} == 47 -BUILD_DEPENDS+= ${LOCALBASE}/gcc47-aux/bin/ada:${PORTSDIR}/lang/gcc47-aux -MAKE_ENV+= PATH=${LOCALBASE}/gcc47-aux/bin:${PATH} -CONFIGURE_ENV+= PATH=${LOCALBASE}/gcc47-aux/bin:${PATH} +. if ${ada_ARGS:M47} +ADAXX= gcc47 +. elif ${ada_ARGS:M5} +ADAXX= gcc5 . else -BUILD_DEPENDS+= ${LOCALBASE}/gcc-aux/bin/ada:${PORTSDIR}/lang/gcc-aux -MAKE_ENV+= PATH=${LOCALBASE}/gcc-aux/bin:${PATH} -CONFIGURE_ENV+= PATH=${LOCALBASE}/gcc-aux/bin:${PATH} +. if defined(ADA_DEFAULT) && ${ADA_DEFAULT} == 5 +ADAXX= gcc5 +. else +ADAXX= gcc +. endif . endif -MAKE_ENV+= ADA_PROJECT_PATH=${LOCALBASE}/lib/gnat -CONFIGURE_ENV+= ADA_PROJECT_PATH=${LOCALBASE}/lib/gnat +BUILD_DEPENDS+= ${LOCALBASE}/gcc47-aux/bin/ada:${PORTSDIR}/lang/${ADAXX}-aux +MAKE_ENV+= PATH=${LOCALBASE}/${ADAXX}-aux/bin:${PATH} \ + ADA_PROJECT_PATH=${LOCALBASE}/lib/gnat +CONFIGURE_ENV+= PATH=${LOCALBASE}/${ADAXX}-aux/bin:${PATH} \ + ADA_PROJECT_PATH=${LOCALBASE}/lib/gnat .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503160104.t2G14F73050170>