Date: Sun, 28 Jun 2015 05:57:35 +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: r390736 - in head/devel/gprbuild: . files Message-ID: <201506280557.t5S5vZn4070581@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Sun Jun 28 05:57:34 2015 New Revision: 390736 URL: https://svnweb.freebsd.org/changeset/ports/390736 Log: devel/gprbuild: Upgrade version 2014 => 2015 This upgrade was necessary because the latest version introduces new switches that Adacore software already uses. I'd been working around it be replacing, for example, "gprinstall" with manual install targets. More importantly, gprbuild is built with project files. This requires either gnatmake (which will drop this functionality on next gcc version) or a copy of gprbuild already installed. Since I don't want to carry binary bootstraps, I wrote a new BSD-style makefile to avoid gprbuild as a dependency for itself. Unlike GPS 2014, it uses the gnat sources that it was provided with instead of gnat_util library. The gpr* sources use functions not yes in FSF GNAT and only one regression patch is needed when built by gcc5-aux. This probably cannot be built by gcc-aux, but there are already several things preventing the return to gcc-aux (over gcc5-aux). I didn't bother with the examples so these are no longer installed, and I didn't install "info" version of documention which follows my other ports. (pdf, txt, and html versions are still installed) Added: head/devel/gprbuild/files/Makefile.BSD (contents, props changed) head/devel/gprbuild/files/patch-gnat_targparm (contents, props changed) Deleted: head/devel/gprbuild/files/extrapatch-5-gprbuild-main.adb head/devel/gprbuild/files/extrapatch-5-gprbuild-post.adb head/devel/gprbuild/files/extrapatch-5-gprbuild-slave.adb head/devel/gprbuild/files/extrapatch-5-gprlib.adb head/devel/gprbuild/files/extrapatch-protocol.adb head/devel/gprbuild/files/extrapatch-src_gprbuild-main.adb head/devel/gprbuild/files/extrapatch-src_gprslave.adb head/devel/gprbuild/files/extrapatch-src_rewrite__data.ada head/devel/gprbuild/files/patch-Makefile.in head/devel/gprbuild/files/patch-gprbuild.gpr head/devel/gprbuild/files/patch-src_gprinstall-install.adb Modified: head/devel/gprbuild/Makefile head/devel/gprbuild/distinfo head/devel/gprbuild/files/patch-share_gprconfig_compilers.xml head/devel/gprbuild/files/patch-share_gprconfig_gnat.xml head/devel/gprbuild/files/patch-share_gprconfig_linker.xml head/devel/gprbuild/files/patch-share_gprconfig_targetset.xml head/devel/gprbuild/files/patch-src_gpr__version.adb head/devel/gprbuild/files/patch-src_gprlib.adb head/devel/gprbuild/pkg-plist Modified: head/devel/gprbuild/Makefile ============================================================================== --- head/devel/gprbuild/Makefile Sat Jun 27 22:34:05 2015 (r390735) +++ head/devel/gprbuild/Makefile Sun Jun 28 05:57:34 2015 (r390736) @@ -3,7 +3,6 @@ PORTNAME= gprbuild PORTVERSION= ${SNAPSHOT} -PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://downloads.dragonlace.net/src/ DISTNAME= gprbuild-gpl-${YEAR}-src @@ -13,67 +12,28 @@ COMMENT= Adacore multi-language software LICENSE= GPLv3 -BUILD_DEPENDS+= xmlada>=4.4:${PORTSDIR}/textproc/xmlada \ - gnat_util>=20140422:${PORTSDIR}/lang/gnat_util +BUILD_DEPENDS= xmlada>=4.4:${PORTSDIR}/textproc/xmlada -YEAR= 2014 -SNAPSHOT= 20140417 -GNU_CONFIGURE= yes -USES= ada gmake -MAKE_ARGS+= BUILD=production -MAKE_ARGS+= PROCESSORS=${MAKE_JOBS_NUMBER} -PORTDOCS= html txt pdf info -PORTEXAMPLES= * - -OPTIONS_DEFINE= DOCS EXAMPLES - -.include <bsd.port.pre.mk> - -.if ${ADAXX:Mgcc} -EXTRA_PATCHES= ${FILESDIR}/extrapatch-protocol.adb \ - ${FILESDIR}/extrapatch-src_gprbuild-main.adb \ - ${FILESDIR}/extrapatch-src_gprslave.adb \ - ${FILESDIR}/extrapatch-src_rewrite__data.ada -.else -EXTRA_PATCHES= ${FILESDIR}/extrapatch-5-gprbuild-main.adb \ - ${FILESDIR}/extrapatch-5-gprbuild-slave.adb \ - ${FILESDIR}/extrapatch-5-gprbuild-post.adb \ - ${FILESDIR}/extrapatch-5-gprlib.adb -.endif - -do-build: -# Recreate the do-build target without -j parameter -# It interferes with PROCESSORS make argument - (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ - ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET}) +YEAR= 2015 +SNAPSHOT= 20150506 +USES= ada +MAKE_ARGS= PROCESSORS=${MAKE_JOBS_NUMBER} +PORTDOCS= html txt pdf +CONHOST= ${CONFIGURE_TARGET} +INSTALL_TARGET= install + +OPTIONS_DEFINE= DOCS +DOCS_INSTALL_TARGET= install-docs + +.include <bsd.port.options.mk> post-patch: - @${REINPLACE_CMD} -e "s,@AUXPREFIX@,${PREFIX}/gcc-aux," \ + ${CP} ${FILESDIR}/Makefile.BSD ${WRKSRC}/Makefile + @${REINPLACE_CMD} -i "" -e "s,@AUXPREFIX@,${PREFIX}/gcc5-aux," \ ${WRKSRC}/share/gprconfig/compilers.xml - # OpenVMS was removed from GCC 5, and it obviously isn't used - # here so replace boolean check to False so it builds on both -.if ${ADAXX:Mgcc} - # Try_Help is part of GNAT Pro, but it's not in GCC 4.9 yet - # It's not strictly needed. Before it just repeated usage. - # There are other messages; just suppress Try_Help on 4 files - ${REINPLACE_CMD} -e '/Try_Help;/d' \ - -e 's|Hostparm.OpenVMS|False|' ${WRKSRC}/src/*-main.adb \ - ${WRKSRC}/src/gprbind.adb ${WRKSRC}/src/gprlib.adb -.else # gcc5-aux - ${REINPLACE_CMD} -e 's|Hostparm.OpenVMS|False|' \ - ${WRKSRC}/src/*-main.adb \ - ${WRKSRC}/src/gprbind.adb \ - ${WRKSRC}/src/gprlib.adb -.endif - -post-install: -.if !${PORT_OPTIONS:MDOCS} - ${RM} -rf ${STAGEDIR}${DOCSDIR} -.endif -.if !${PORT_OPTIONS:MEXAMPLES} - ${RM} -rf ${STAGEDIR}${EXAMPLESDIR} -.endif - (cd ${STAGEDIR}${PREFIX} && ${FIND} share/examples -type d -empty | \ - ${SORT} -dr | ${XARGS} ${RMDIR}) + ${SED} -e 's|@host@|${CONHOST}|' \ + ${WRKSRC}/src/gprconfig-sdefault.ads.in > \ + ${WRKSRC}/src/gprconfig-sdefault.ads + ${MV} ${WRKSRC}/share/gprconfig/*.orig ${WRKSRC}/obj-cov -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/devel/gprbuild/distinfo ============================================================================== --- head/devel/gprbuild/distinfo Sat Jun 27 22:34:05 2015 (r390735) +++ head/devel/gprbuild/distinfo Sun Jun 28 05:57:34 2015 (r390736) @@ -1,2 +1,2 @@ -SHA256 (gprbuild-gpl-2014-src.tar.gz) = 3c8986ff5f83cc0d3ee69f6e71d9f69a7eb1a7e2656493c829b18fb55c4ad5ac -SIZE (gprbuild-gpl-2014-src.tar.gz) = 2384695 +SHA256 (gprbuild-gpl-2015-src.tar.gz) = 5d5bbc8c57075250c264e2f15d9949383450ac696eb8a90803c2a36b55ecd0e2 +SIZE (gprbuild-gpl-2015-src.tar.gz) = 3424715 Added: head/devel/gprbuild/files/Makefile.BSD ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gprbuild/files/Makefile.BSD Sun Jun 28 05:57:34 2015 (r390736) @@ -0,0 +1,97 @@ +.PHONY: all +.PHONY: generate_sources + +AFLAGS= -gnat12 -gnaty -gnatQ -O2 -gnatpn -gnatws -g1 -j${PROCESSORS} + +COBJS= obj/link.o obj/gprbuild_dummies.o + +LOOK= -aI${.CURDIR}/gnat -aI${.CURDIR}/gen_src \ + -aL${PREFIX}/lib/xmlada/static -aI${PREFIX}/include/xmlada +LARGS= -largs ${.CURDIR}/obj/link.o \ + -largs ${.CURDIR}/obj/gprbuild_dummies.o \ + -largs ${PREFIX}/lib/xmlada/static/libxmlada_dom.a \ + -largs ${PREFIX}/lib/xmlada/static/libxmlada_input_sources.a \ + -largs ${PREFIX}/lib/xmlada/static/libxmlada_sax.a \ + -largs ${PREFIX}/lib/xmlada/static/libxmlada_schema.a \ + -largs ${PREFIX}/lib/xmlada/static/libxmlada_unicode.a + +GENDIR= gen_src +GEN_SRCS= ${GENDIR}/snames.adb ${GENDIR}/snames.ads +DOCSDIR= ${PREFIX}/share/doc/gprbuild + +all: gprbuild + +install: + mkdir -p ${DESTDIR}${PREFIX}/bin \ + ${DESTDIR}${PREFIX}/libexec/gprbuild \ + ${DESTDIR}${PREFIX}/share/gpr \ + ${DESTDIR}${PREFIX}/share/gprconfig + ${BSD_INSTALL_PROGRAM} ${.CURDIR}/obj/gprclean \ + ${.CURDIR}/obj/gprinstall \ + ${.CURDIR}/obj/gprconfig \ + ${.CURDIR}/obj/gprslave \ + ${.CURDIR}/obj/gprbuild ${DESTDIR}${PREFIX}/bin + ${BSD_INSTALL_PROGRAM} ${.CURDIR}/obj/gprbind \ + ${.CURDIR}/obj/gprlib ${DESTDIR}${PREFIX}/libexec/gprbuild + ${BSD_INSTALL_DATA} ${.CURDIR}/share/_default.gpr \ + ${DESTDIR}${PREFIX}/share/gpr + ${BSD_INSTALL_DATA} ${.CURDIR}/share/gprconfig/* \ + ${DESTDIR}${PREFIX}/share/gprconfig + +install-docs: + mkdir -p ${DESTDIR}${DOCSDIR}/html ${DESTDIR}${DOCSDIR}/txt \ + ${DESTDIR}${DOCSDIR}/pdf + ${BSD_INSTALL_DATA} ${.CURDIR}/doc/txt/gprbuild_ug.txt \ + ${DESTDIR}${DOCSDIR}/txt + ${BSD_INSTALL_DATA} ${.CURDIR}/doc/pdf/gprbuild_ug.pdf \ + ${DESTDIR}${DOCSDIR}/pdf + cp -r ${.CURDIR}/doc/html/* ${DESTDIR}${DOCSDIR}/html + rm -rf ${DESTDIR}${DOCSDIR}/html/_sources + ${BSD_INSTALL_DATA} ${.CURDIR}/doc/*.png \ + ${DESTDIR}${DOCSDIR}/html + +gprclean: src/gprclean-main.adb ${GEN_SRCS} ${COBJS} + gnatmake -o ${.TARGET} ${AFLAGS} ${LOOK} \ + ${.CURDIR}/src/gprclean-main.adb ${LARGS} + +gprbind: gprclean src/gprslave.adb ${GEN_SRCS} ${COBJS} + gnatmake -o ${.TARGET} ${AFLAGS} ${LOOK} \ + ${.CURDIR}/src/gprbind.adb ${LARGS} + +gprlib: gprbind src/gprslave.adb ${GEN_SRCS} ${COBJS} + gnatmake -o ${.TARGET} ${AFLAGS} ${LOOK} \ + ${.CURDIR}/src/gprlib.adb ${LARGS} + +gprslave: gprlib src/gprslave.adb ${GEN_SRCS} ${COBJS} + gnatmake -o ${.TARGET} ${AFLAGS} ${LOOK} \ + ${.CURDIR}/src/gprslave.adb ${LARGS} + +gprinstall: gprslave src/gprinstall-main.adb ${GEN_SRCS} ${COBJS} + gnatmake -o ${.TARGET} ${AFLAGS} ${LOOK} \ + ${.CURDIR}/src/gprinstall-main.adb ${LARGS} + +gprconfig: gprinstall src/gprconfig-main.adb ${GEN_SRCS} ${COBJS} + gnatmake -o ${.TARGET} ${AFLAGS} ${LOOK} \ + ${.CURDIR}/src/gprconfig-main.adb ${LARGS} + +gprbuild: gprconfig src/gprbuild-main.adb ${GEN_SRCS} ${COBJS} + gnatmake -o ${.TARGET} ${AFLAGS} ${LOOK} \ + ${.CURDIR}/src/gprbuild-main.adb ${LARGS} + +obj/link.o: gnat/link.c + gcc -c -o ${.CURDIR}/${.TARGET} ${.ALLSRC} + +obj/gprbuild_dummies.o: src/gprbuild_dummies.c + gcc -c -o ${.CURDIR}/${.TARGET} ${.ALLSRC} + +generate_sources: + mkdir -p ${.CURDIR}/${GENDIR} + (cd ${.CURDIR}/gnat && cp xsnamest.adb xutil.* snames.adb-tmpl \ + snames.ads-tmpl snames.h-tmpl ../${GENDIR}) + (cd ${.CURDIR}/${GENDIR} && \ + gnatmake -gnatf -gnatwae -gnatyg -gnatyS xsnamest && \ + ./xsnamest && \ + mv snames.ns snames.ads && \ + mv snames.nb snames.adb) + +${GEN_SRCS}: generate_sources Added: head/devel/gprbuild/files/patch-gnat_targparm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gprbuild/files/patch-gnat_targparm Sun Jun 28 05:57:34 2015 (r390736) @@ -0,0 +1,302 @@ +These restriction pragmas are not yet supported on FSF GNAT 5: + No_Specification_Of_Aspect + No_Use_Of_Attribute + No_Use_Of_Pragma + +--- gnat/targparm.ads.orig 2015-05-06 11:08:38 UTC ++++ gnat/targparm.ads +@@ -615,53 +615,28 @@ package Targparm is + -- selected component with Sloc value System_Location and given Prefix + -- (Pre) and Selector (Sel) values. + +- type Set_NOD_Type is access procedure (Unit : Node_Id); ++ type Set_RND_Type is access procedure (Unit : Node_Id); + -- Parameter type for Get_Target_Parameters that records a Restriction + -- No_Dependence for the given unit (identifier or selected component). + +- type Set_NSA_Type is access procedure (Asp : Name_Id; OK : out Boolean); +- -- Parameter type for Get_Target_Parameters that records a Restriction +- -- No_Specification_Of_Aspect. Asp is the aspect name. OK is set True +- -- if this is an OK aspect name, and False if it is not an aspect name. +- +- type Set_NUA_Type is access procedure (Attr : Name_Id; OK : out Boolean); +- -- Parameter type for Get_Target_Parameters that records a Restriction +- -- No_Use_Of_Attribute. Attr is the attribute name. OK is set True if +- -- this is an OK attribute name, and False if it is not an attribute name. +- +- type Set_NUP_Type is access procedure (Prag : Name_Id; OK : out Boolean); +- -- Parameter type for Get_Target_Parameters that records a Restriction +- -- No_Use_Of_Pragma. Prag is the pragma name. OK is set True if this is +- -- an OK pragma name, and False if it is not a recognized pragma name. +- + procedure Get_Target_Parameters + (System_Text : Source_Buffer_Ptr; + Source_First : Source_Ptr; + Source_Last : Source_Ptr; + Make_Id : Make_Id_Type := null; + Make_SC : Make_SC_Type := null; +- Set_NOD : Set_NOD_Type := null; +- Set_NSA : Set_NSA_Type := null; +- Set_NUA : Set_NUA_Type := null; +- Set_NUP : Set_NUP_Type := null); +- -- Called at the start of execution to obtain target parameters from the +- -- source of package System. The parameters provide the source text to be +- -- scanned (in System_Text (Source_First .. Source_Last)). If the three +- -- subprograms Make_Id, Make_SC, and Set_NOD are left at their default +- -- value of null, Get_Target_Parameters will ignore pragma Restrictions +- -- (No_Dependence) lines; otherwise it will use these three subprograms to +- -- record them. Similarly, if Set_NUP is left at its default value of null, +- -- then any occurrences of pragma Restrictions (No_Use_Of_Pragma => XXX) +- -- will be ignored; otherwise it will use this procedure to record the +- -- pragma. Similarly for the NSA and NUA cases. ++ Set_RND : Set_RND_Type := null); ++ -- Called at the start of execution to obtain target parameters from ++ -- the source of package System. The parameters provide the source ++ -- text to be scanned (in System_Text (Source_First .. Source_Last)). ++ -- if the three subprograms are left at their default value of null, ++ -- Get_Target_Parameters will ignore pragma Restrictions No_Dependence ++ -- lines, otherwise it will use these three subprograms to record them. + + procedure Get_Target_Parameters + (Make_Id : Make_Id_Type := null; + Make_SC : Make_SC_Type := null; +- Set_NOD : Set_NOD_Type := null; +- Set_NSA : Set_NSA_Type := null; +- Set_NUA : Set_NUA_Type := null; +- Set_NUP : Set_NUP_Type := null); ++ Set_RND : Set_RND_Type := null); + -- This version reads in system.ads using Osint. The idea is that the + -- caller uses the first version if they have to read system.ads anyway + -- (e.g. the compiler) and uses this simpler interface if system.ads is +--- gnat/targparm.adb.orig 2015-05-06 11:08:38 UTC ++++ gnat/targparm.adb +@@ -154,10 +154,7 @@ package body Targparm is + procedure Get_Target_Parameters + (Make_Id : Make_Id_Type := null; + Make_SC : Make_SC_Type := null; +- Set_NOD : Set_NOD_Type := null; +- Set_NSA : Set_NSA_Type := null; +- Set_NUA : Set_NUA_Type := null; +- Set_NUP : Set_NUP_Type := null) ++ Set_RND : Set_RND_Type := null) + is + Text : Source_Buffer_Ptr; + Hi : Source_Ptr; +@@ -184,10 +181,7 @@ package body Targparm is + Source_Last => Hi, + Make_Id => Make_Id, + Make_SC => Make_SC, +- Set_NOD => Set_NOD, +- Set_NSA => Set_NSA, +- Set_NUA => Set_NUA, +- Set_NUP => Set_NUP); ++ Set_RND => Set_RND); + end Get_Target_Parameters; + + -- Version where caller supplies system.ads text +@@ -198,10 +192,7 @@ package body Targparm is + Source_Last : Source_Ptr; + Make_Id : Make_Id_Type := null; + Make_SC : Make_SC_Type := null; +- Set_NOD : Set_NOD_Type := null; +- Set_NSA : Set_NSA_Type := null; +- Set_NUA : Set_NUA_Type := null; +- Set_NUP : Set_NUP_Type := null) ++ Set_RND : Set_RND_Type := null) + is + P : Source_Ptr; + -- Scans source buffer containing source of system.ads +@@ -212,48 +203,6 @@ package body Targparm is + Result : Boolean; + -- Records boolean from system line + +- OK : Boolean; +- -- Status result from Set_NUP/NSA/NUA call +- +- PR_Start : Source_Ptr; +- -- Pointer to ( following pragma Restrictions +- +- procedure Collect_Name; +- -- Scan a name starting at System_Text (P), and put Name in Name_Buffer, +- -- with Name_Len being length, folded to lower case. On return, P points +- -- just past the last character (which should be a right paren). +- +- ------------------ +- -- Collect_Name -- +- ------------------ +- +- procedure Collect_Name is +- begin +- Name_Len := 0; +- loop +- if System_Text (P) in 'a' .. 'z' +- or else +- System_Text (P) = '_' +- or else +- System_Text (P) in '0' .. '9' +- then +- Name_Buffer (Name_Len + 1) := System_Text (P); +- +- elsif System_Text (P) in 'A' .. 'Z' then +- Name_Buffer (Name_Len + 1) := +- Character'Val (Character'Pos (System_Text (P)) + 32); +- +- else +- exit; +- end if; +- +- P := P + 1; +- Name_Len := Name_Len + 1; +- end loop; +- end Collect_Name; +- +- -- Start of processing for Get_Target_Parameters +- + begin + if Parameters_Obtained then + return; +@@ -312,9 +261,6 @@ package body Targparm is + + elsif System_Text (P .. P + 20) = "pragma Restrictions (" then + P := P + 21; +- PR_Start := P - 1; +- +- -- Boolean restrictions + + Rloop : for K in All_Boolean_Restrictions loop + declare +@@ -339,9 +285,7 @@ package body Targparm is + null; + end loop Rloop; + +- -- Restrictions taking integer parameter +- +- Ploop : for K in Integer_Parameter_Restrictions loop ++ Ploop : for K in All_Parameter_Restrictions loop + declare + Rname : constant String := + All_Parameter_Restrictions'Image (K); +@@ -456,119 +400,23 @@ package body Targparm is + P := P + 1; + end loop; + +- Set_NOD (Unit); ++ Set_RND (Unit); + goto Line_Loop_Continue; + end; +- +- -- No_Specification_Of_Aspect case +- +- elsif System_Text (P .. P + 29) = "No_Specification_Of_Aspect => " +- then +- P := P + 30; +- +- -- Skip this processing (and simply ignore the pragma), if +- -- caller did not supply the subprogram we need to process +- -- such lines. +- +- if Set_NSA = null then +- goto Line_Loop_Continue; +- end if; +- +- -- We have scanned +- -- "pragma Restrictions (No_Specification_Of_Aspect =>" +- +- Collect_Name; +- +- if System_Text (P) /= ')' then +- goto Bad_Restrictions_Pragma; +- +- else +- Set_NSA (Name_Find, OK); +- +- if OK then +- goto Line_Loop_Continue; +- else +- goto Bad_Restrictions_Pragma; +- end if; +- end if; +- +- -- No_Use_Of_Attribute case +- +- elsif System_Text (P .. P + 22) = "No_Use_Of_Attribute => " then +- P := P + 23; +- +- -- Skip this processing (and simply ignore No_Use_Of_Attribute +- -- lines) if caller did not supply the subprogram we need to +- -- process such lines. +- +- if Set_NUA = null then +- goto Line_Loop_Continue; +- end if; +- +- -- We have scanned +- -- "pragma Restrictions (No_Use_Of_Attribute =>" +- +- Collect_Name; +- +- if System_Text (P) /= ')' then +- goto Bad_Restrictions_Pragma; +- +- else +- Set_NUA (Name_Find, OK); +- +- if OK then +- goto Line_Loop_Continue; +- else +- goto Bad_Restrictions_Pragma; +- end if; +- end if; +- +- -- No_Use_Of_Pragma case +- +- elsif System_Text (P .. P + 19) = "No_Use_Of_Pragma => " then +- P := P + 20; +- +- -- Skip this processing (and simply ignore No_Use_Of_Pragma +- -- lines) if caller did not supply the subprogram we need to +- -- process such lines. +- +- if Set_NUP = null then +- goto Line_Loop_Continue; +- end if; +- +- -- We have scanned +- -- "pragma Restrictions (No_Use_Of_Pragma =>" +- +- Collect_Name; +- +- if System_Text (P) /= ')' then +- goto Bad_Restrictions_Pragma; +- +- else +- Set_NUP (Name_Find, OK); +- +- if OK then +- goto Line_Loop_Continue; +- else +- goto Bad_Restrictions_Pragma; +- end if; +- end if; + end if; + + -- Here if unrecognizable restrictions pragma form + +- <<Bad_Restrictions_Pragma>> +- + Set_Standard_Error; + Write_Line + ("fatal error: system.ads is incorrectly formatted"); + Write_Str ("unrecognized or incorrect restrictions pragma: "); + +- P := PR_Start; ++ while System_Text (P) /= ')' ++ and then ++ System_Text (P) /= ASCII.LF + loop +- exit when System_Text (P) = ASCII.LF; + Write_Char (System_Text (P)); +- exit when System_Text (P) = ')'; + P := P + 1; + end loop; + Modified: head/devel/gprbuild/files/patch-share_gprconfig_compilers.xml ============================================================================== --- head/devel/gprbuild/files/patch-share_gprconfig_compilers.xml Sat Jun 27 22:34:05 2015 (r390735) +++ head/devel/gprbuild/files/patch-share_gprconfig_compilers.xml Sun Jun 28 05:57:34 2015 (r390736) @@ -1,6 +1,6 @@ ---- share/gprconfig/compilers.xml.orig 2014-03-21 10:41:06.000000000 +0000 +--- share/gprconfig/compilers.xml.orig 2015-04-28 15:02:41 UTC +++ share/gprconfig/compilers.xml -@@ -657,16 +657,15 @@ +@@ -693,17 +693,15 @@ </version> <languages>Ada</languages> <variable name="gcc_version"> @@ -12,8 +12,9 @@ - <directory group="default" >\.\./lib/gcc(-lib)?/$TARGET/$gcc_version/adalib/</directory> - <directory group="default" contents="^rts-">\.\./lib/gcc(-lib)?/$TARGET/$gcc_version/ada_object_path</directory> - <directory group="2" >\.\./lib/gcc(-lib)?/$TARGET/$gcc_version/rts-(.*)/adalib/</directory> +- <directory group="1" >\.\./$TARGET/lib/gnat/(.*)/adalib/</directory> + <directory group="default">\.\./lib/gcc/$TARGET/$gcc_version/adalib</directory> -+ <directory group="0">@AUXPREFIX@/lib/gcc/$TARGET/$gcc_version/adalib</directory> ++ <directory group="0">/usr/local/gcc5-aux/lib/gcc/$TARGET/$gcc_version/adalib</directory> </runtimes> <target> - <external>${PREFIX}gcc -dumpmachine</external> Modified: head/devel/gprbuild/files/patch-share_gprconfig_gnat.xml ============================================================================== --- head/devel/gprbuild/files/patch-share_gprconfig_gnat.xml Sat Jun 27 22:34:05 2015 (r390735) +++ head/devel/gprbuild/files/patch-share_gprconfig_gnat.xml Sun Jun 28 05:57:34 2015 (r390736) @@ -1,11 +1,11 @@ ---- share/gprconfig/gnat.xml.orig 2013-09-16 15:29:28.000000000 +0000 +--- share/gprconfig/gnat.xml.orig 2014-10-13 22:03:37 UTC +++ share/gprconfig/gnat.xml @@ -63,7 +63,7 @@ </config> </configuration> - <!-- GNAT --> -+ <!-- GNAT (tailored to lang/gcc-aux) --> ++ <!-- GNAT (tailored to lang/gcc5-aux) --> <configuration> &filter_gnat; <config> Modified: head/devel/gprbuild/files/patch-share_gprconfig_linker.xml ============================================================================== --- head/devel/gprbuild/files/patch-share_gprconfig_linker.xml Sat Jun 27 22:34:05 2015 (r390735) +++ head/devel/gprbuild/files/patch-share_gprconfig_linker.xml Sun Jun 28 05:57:34 2015 (r390736) @@ -1,6 +1,6 @@ ---- share/gprconfig/linker.xml.orig 2014-02-13 04:59:56.000000000 +0000 +--- share/gprconfig/linker.xml.orig 2015-04-28 14:21:56 UTC +++ share/gprconfig/linker.xml -@@ -599,11 +599,14 @@ +@@ -687,11 +687,14 @@ </config> </configuration> @@ -16,7 +16,7 @@ <target name="^.*irix.*$" /> </targets> <config> -@@ -675,10 +678,13 @@ +@@ -763,10 +766,13 @@ </config> </configuration> @@ -31,7 +31,7 @@ </targets> <config> for Run_Path_Option use ("-Wl,-rpath,"); -@@ -1181,6 +1187,12 @@ +@@ -1308,6 +1314,12 @@ <target name="^.*mingw.*$" /> <target name="^.*linux.*$" /> <target name="^.*freebsd.*$" /> @@ -44,7 +44,7 @@ </targets> <compilers negate="true"> <compiler language="C++" /> -@@ -1265,6 +1277,9 @@ +@@ -1392,6 +1404,9 @@ <target name="^.*mingw.*$" /> <target name="^.*linux.*$" /> <target name="^.*freebsd.*$" /> Modified: head/devel/gprbuild/files/patch-share_gprconfig_targetset.xml ============================================================================== --- head/devel/gprbuild/files/patch-share_gprconfig_targetset.xml Sat Jun 27 22:34:05 2015 (r390735) +++ head/devel/gprbuild/files/patch-share_gprconfig_targetset.xml Sun Jun 28 05:57:34 2015 (r390736) @@ -1,4 +1,4 @@ ---- share/gprconfig/targetset.xml.orig 2014-02-13 04:59:56.000000000 +0000 +--- share/gprconfig/targetset.xml.orig 2014-09-11 13:36:47 UTC +++ share/gprconfig/targetset.xml @@ -66,8 +66,8 @@ @@ -11,7 +11,7 @@ </targetset> <!-- x86-windows (mingw) --> -@@ -156,19 +156,34 @@ +@@ -162,19 +162,34 @@ <target>pent.*-cygwin.*</target> </targetset> Modified: head/devel/gprbuild/files/patch-src_gpr__version.adb ============================================================================== --- head/devel/gprbuild/files/patch-src_gpr__version.adb Sat Jun 27 22:34:05 2015 (r390735) +++ head/devel/gprbuild/files/patch-src_gpr__version.adb Sun Jun 28 05:57:34 2015 (r390736) @@ -1,4 +1,4 @@ ---- src/gpr_version.adb.orig 2014-04-17 09:50:17.000000000 +0000 +--- src/gpr_version.adb.orig 2015-05-06 11:08:38 UTC +++ src/gpr_version.adb @@ -65,14 +65,7 @@ package body GPR_Version is end if; Modified: head/devel/gprbuild/files/patch-src_gprlib.adb ============================================================================== --- head/devel/gprbuild/files/patch-src_gprlib.adb Sat Jun 27 22:34:05 2015 (r390735) +++ head/devel/gprbuild/files/patch-src_gprlib.adb Sun Jun 28 05:57:34 2015 (r390736) @@ -1,9 +1,6 @@ -The brain-dead handling of Rpath continues in GPRBuild 2014 -Bring in the GPRBuild 2012/2013 fix again - ---- src/gprlib.adb.orig 2014-04-17 09:50:17.000000000 +0000 +--- src/gprlib.adb.orig 2015-05-06 11:08:38 UTC +++ src/gprlib.adb -@@ -408,6 +408,11 @@ procedure Gprlib is +@@ -393,6 +393,11 @@ procedure Gprlib is Separate_Run_Path_Options : Boolean := False; @@ -15,7 +12,7 @@ Bring in the GPRBuild 2012/2013 fix agai Rpath : String_List_Access := null; -- Allocated only if Path Option is supported -@@ -1040,7 +1045,12 @@ begin +@@ -1011,7 +1016,12 @@ begin Use_GNAT_Lib := False; end if; @@ -29,7 +26,7 @@ Bring in the GPRBuild 2012/2013 fix agai when Gprexch.Library_Rpath_Options => Library_Rpath_Options_Table.Append -@@ -2166,7 +2176,7 @@ begin +@@ -2113,7 +2123,7 @@ begin Library_Switches_Table.Append (new String'("-L" & Imported_Library_Directories.Table (J).all)); Modified: head/devel/gprbuild/pkg-plist ============================================================================== --- head/devel/gprbuild/pkg-plist Sat Jun 27 22:34:05 2015 (r390735) +++ head/devel/gprbuild/pkg-plist Sun Jun 28 05:57:34 2015 (r390736) @@ -14,6 +14,7 @@ share/gprconfig/cpp.xml share/gprconfig/cross.xml share/gprconfig/fortran.xml share/gprconfig/gnat.xml +share/gprconfig/gnat_runtime.mapping share/gprconfig/gprconfig.xsd share/gprconfig/linker.xml share/gprconfig/nocompiler.xml
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506280557.t5S5vZn4070581>