svn commit: r347692 - head/Mk/Uses

John Marino marino at FreeBSD.org
Sun Mar 9 21:25:47 UTC 2014


Author: marino
Date: Sun Mar  9 21:25:46 2014
New Revision: 347692
URL: http://svnweb.freebsd.org/changeset/ports/347692
QAT: https://qat.redports.org/buildarchive/r347692/

Log:
  Uses/ada.mk: Add support for soon-to-be-older Ada compiler
  
  Currently the Ada framework uses a single compiler based on gcc47.
  Soon this compiler will be updated to the gcc49 base, but not all Ada
  ports are currently happy about this.
  
  This update to ada.mk induces the ARGS of "47" which causes the port to
  use the newly-created lang/gcc47-aux port which is currently a clone
  of lang/gcc-aux.  When the latter is updated, the Ada Framework will
  use it except for those ports that feature "USES+= ada:47"

Modified:
  head/Mk/Uses/ada.mk

Modified: head/Mk/Uses/ada.mk
==============================================================================
--- head/Mk/Uses/ada.mk	Sun Mar  9 20:55:38 2014	(r347691)
+++ head/Mk/Uses/ada.mk	Sun Mar  9 21:25:46 2014	(r347692)
@@ -6,22 +6,24 @@
 #
 # Feature:      ada
 # Usage:        USES=ada
-# Valid ARGS:   does not require args
+# Valid ARGS:   47
 
 .if !defined(_INCLUDE_USES_ADA_MK)
 _INCLUDE_USES_ADA_MK=    yes
 
-.if defined(ada_ARGS)
-IGNORE= USES=ada does not require args
-.endif
+CC= ada
 
-CC=		ada
+. if defined(ada_ARGS) && ${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}
+. else
 BUILD_DEPENDS+=	${LOCALBASE}/gcc-aux/bin/ada:${PORTSDIR}/lang/gcc-aux
-
 MAKE_ENV+=	PATH=${LOCALBASE}/gcc-aux/bin:${PATH}
-MAKE_ENV+=	ADA_PROJECT_PATH=${LOCALBASE}/lib/gnat
-
 CONFIGURE_ENV+=	PATH=${LOCALBASE}/gcc-aux/bin:${PATH}
+. endif
+
+MAKE_ENV+=	ADA_PROJECT_PATH=${LOCALBASE}/lib/gnat
 CONFIGURE_ENV+=	ADA_PROJECT_PATH=${LOCALBASE}/lib/gnat
 
 .endif


More information about the svn-ports-all mailing list