svn commit: r381453 - in head/lang/asis: . files
John Marino
marino at FreeBSD.org
Mon Mar 16 22:30:17 UTC 2015
Author: marino
Date: Mon Mar 16 22:30:16 2015
New Revision: 381453
URL: https://svnweb.freebsd.org/changeset/ports/381453
QAT: https://qat.redports.org/buildarchive/r381453/
Log:
lang/asis: Fix build on gcc5-aux
The OpenVMS support was removed on gcc5's GNAT so the GPL 2014 version
of ASIS won't build unless the references to OpenVMS are removed. Rather
than use EXTRA_PATCHES, just remove them unconditionally. This doesn't
cause any issue for gcc-aux-built ASIS and the ports that use it.
Added:
head/lang/asis/files/patch-no-OpenVMS.diff (contents, props changed)
Modified:
head/lang/asis/Makefile
Modified: head/lang/asis/Makefile
==============================================================================
--- head/lang/asis/Makefile Mon Mar 16 22:14:04 2015 (r381452)
+++ head/lang/asis/Makefile Mon Mar 16 22:30:16 2015 (r381453)
@@ -3,6 +3,7 @@
PORTNAME= asis
PORTVERSION= 2014
+PORTREVISION= 1
CATEGORIES= lang
MASTER_SITES= http://downloads.dragonlace.net/src/
DISTNAME= ${PORTNAME}-gpl-${PORTVERSION}-src
@@ -28,6 +29,15 @@ post-extract:
${WRKSRC}/Makefile \
${WRKSRC}/Makefile.stub \
${WRKSRC}/common.gpr
+ @${REINPLACE_CMD} -e 's|Hostparm.OpenVMS|False|' \
+ ${WRKSRC}/asis/a4g-a_types.adb \
+ ${WRKSRC}/tools/gnatmetric/asis_ul-env* \
+ ${WRKSRC}/tools/tool_utils/asis_ul-environment.adb \
+ ${WRKSRC}/tools/tool_utils/asis_ul-projects.adb \
+ ${WRKSRC}/tools/tool_utils/asis_ul-common.adb \
+ ${WRKSRC}/tools/gnatpp/gnatpp-processing.adb \
+ ${WRKSRC}/tools/gnatpp/gnatpp-output.ad[sb]
+
@${RM} -rf ${WRKSRC}/gnat
do-build:
Added: head/lang/asis/files/patch-no-OpenVMS.diff
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lang/asis/files/patch-no-OpenVMS.diff Mon Mar 16 22:30:16 2015 (r381453)
@@ -0,0 +1,70 @@
+OpenVMS Support was removed from gcc5-aux, so remove Name_AST_Entry
+This patch can be applied to gcc-aux version too.
+
+--- asis/a4g-a_sem.adb.orig 2014-04-10 13:38:35 UTC
++++ asis/a4g-a_sem.adb
+@@ -1317,14 +1317,12 @@ package body A4G.A_Sem is
+ Name_Complex_Representation |
+ Name_CPP_Class |
+ Name_CPP_Constructor |
+- Name_Export_Exception |
+ Name_Export_Function |
+ Name_Export_Object |
+ Name_Export_Procedure |
+ Name_Export_Valued_Procedure |
+ Name_Favor_Top_Level |
+ Name_Finalize_Storage_Only |
+- Name_Import_Exception |
+ Name_Import_Function |
+ Name_Import_Object |
+ Name_Import_Procedure |
+@@ -1371,22 +1369,6 @@ package body A4G.A_Sem is
+ end if;
+
+ -- Cases when a specific processing is needed
+- when Name_Float_Representation =>
+- Pragma_Arg := First (Pragma_Argument_Associations (Pragma_Node));
+-
+- if Present (Next (Pragma_Arg)) then
+- Pragma_Arg := Next (Pragma_Arg);
+- end if;
+-
+- Pragma_Arg := Sinfo.Expression (Pragma_Arg);
+-
+- if Entity (Pragma_Arg) = Entity_Node
+- or else
+- Chars (Pragma_Arg) = Chars (Entity_Node)
+- then
+- Result := True;
+- end if;
+-
+ when Name_Obsolescent =>
+
+ if Is_Obsolescent (Entity_Node) then
+@@ -1633,8 +1615,6 @@ package body A4G.A_Sem is
+ if not (
+ N in First_Pragma_Name .. Last_Pragma_Name
+ or else
+- N = Name_AST_Entry
+- or else
+ N = Name_CPU
+ or else
+ N = Name_Interface
+--- asis/a4g-mapping.adb.orig 2014-04-10 13:38:35 UTC
++++ asis/a4g-mapping.adb
+@@ -1884,7 +1884,6 @@ package body A4G.Mapping is
+ Attribute_Chars = Name_Address_Size or else
+ Attribute_Chars = Name_Asm_Input or else
+ Attribute_Chars = Name_Asm_Output or else
+- Attribute_Chars = Name_AST_Entry or else -- VMS
+ Attribute_Chars = Name_Bit or else
+ Attribute_Chars = Name_Bit_Position or else
+ Attribute_Chars = Name_Code_Address or else
+@@ -3169,7 +3168,6 @@ package body A4G.Mapping is
+
+ elsif Pragma_Chars in
+ First_Pragma_Name .. Last_Pragma_Name |
+- Name_AST_Entry |
+ Name_Interface
+ then
+ -- We have already checked for all the standard pragma names, so
More information about the svn-ports-head
mailing list