Index: patches/patch-gcc_ada_Make-generated_in
===================================================================
RCS file: patches/patch-gcc_ada_Make-generated_in
diff -N patches/patch-gcc_ada_Make-generated_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-gcc_ada_Make-generated_in 22 Jul 2019 05:25:01 -0000
@@ -0,0 +1,29 @@
+$OpenBSD$
+
+Index: gcc/ada/Make-generated.in
+--- gcc/ada/Make-generated.in.orig
++++ gcc/ada/Make-generated.in
+@@ -28,6 +28,7 @@ $(ADA_GEN_SUBDIR)/treeprs.ads : $(ADA_GEN_SUBDIR)/tree
+ -$(MKDIR) $(ADA_GEN_SUBDIR)/bldtools/treeprs
+ $(RM) $(addprefix $(ADA_GEN_SUBDIR)/bldtools/treeprs/,$(notdir $^))
+ $(CP) $^ $(ADA_GEN_SUBDIR)/bldtools/treeprs
++ touch $(ADA_GEN_SUBDIR)/bldtools/treeprs/treeprs.ads
+ (cd $(ADA_GEN_SUBDIR)/bldtools/treeprs; gnatmake -q xtreeprs ; ./xtreeprs treeprs.ads )
+ $(MOVE_IF_CHANGE) $(ADA_GEN_SUBDIR)/bldtools/treeprs/treeprs.ads $(ADA_GEN_SUBDIR)/treeprs.ads
+
+@@ -42,6 +43,7 @@ $(ADA_GEN_SUBDIR)/sinfo.h : $(ADA_GEN_SUBDIR)/sinfo.ad
+ -$(MKDIR) $(ADA_GEN_SUBDIR)/bldtools/sinfo
+ $(RM) $(addprefix $(ADA_GEN_SUBDIR)/bldtools/sinfo/,$(notdir $^))
+ $(CP) $^ $(ADA_GEN_SUBDIR)/bldtools/sinfo
++ touch $(ADA_GEN_SUBDIR)/bldtools/sinfo/sinfo.h
+ (cd $(ADA_GEN_SUBDIR)/bldtools/sinfo; gnatmake -q xsinfo ; ./xsinfo sinfo.h )
+ $(MOVE_IF_CHANGE) $(ADA_GEN_SUBDIR)/bldtools/sinfo/sinfo.h $(ADA_GEN_SUBDIR)/sinfo.h
+
+@@ -50,6 +52,7 @@ $(ADA_GEN_SUBDIR)/stamp-snames : $(ADA_GEN_SUBDIR)/sna
+ -$(MKDIR) $(ADA_GEN_SUBDIR)/bldtools/snamest
+ $(RM) $(addprefix $(ADA_GEN_SUBDIR)/bldtools/snamest/,$(notdir $^))
+ $(CP) $^ $(ADA_GEN_SUBDIR)/bldtools/snamest
++ touch $(ADA_GEN_SUBDIR)/bldtools/snamest/snames.n{b,h,s}
+ (cd $(ADA_GEN_SUBDIR)/bldtools/snamest; gnatmake -q xsnamest ; ./xsnamest )
+ $(MOVE_IF_CHANGE) $(ADA_GEN_SUBDIR)/bldtools/snamest/snames.ns $(ADA_GEN_SUBDIR)/snames.ads
+ $(MOVE_IF_CHANGE) $(ADA_GEN_SUBDIR)/bldtools/snamest/snames.nb $(ADA_GEN_SUBDIR)/snames.adb
Index: patches/patch-gcc_ada_gcc-interface_Makefile_in
===================================================================
RCS file: /cvs/ports/lang/gcc/8/patches/patch-gcc_ada_gcc-interface_Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-gcc_ada_gcc-interface_Makefile_in
--- patches/patch-gcc_ada_gcc-interface_Makefile_in 4 Jan 2019 15:50:40 -0000 1.1.1.1
+++ patches/patch-gcc_ada_gcc-interface_Makefile_in 22 Jul 2019 05:25:01 -0000
@@ -240,3 +240,18 @@ Index: gcc/ada/gcc-interface/Makefile.in
tb-gcc.c libgnarl/thread.c $(EXTRA_LIBGNAT_SRCS)
# GNATRTL_NONTASKING_OBJS and GNATRTL_TASKING_OBJS can be found in
+@@ -2398,12 +2613,14 @@ OSCONS_EXTRACT=$(OSCONS_CC) $(GNATLIBCFLAGS_FOR_C) -S
+ ./bldtools/oscons/xoscons: xoscons.adb xutil.ads xutil.adb
+ -$(MKDIR) ./bldtools/oscons
+ $(RM) $(addprefix ./bldtools/oscons/,$(notdir $^))
++ touch ./bldtools/oscons/xoscons
+ $(CP) $^ ./bldtools/oscons
+ (cd ./bldtools/oscons ; gnatmake -q xoscons)
+
+ $(RTSDIR)/s-oscons.ads: ../stamp-gnatlib1-$(RTSDIR) s-oscons-tmplt.c gsocket.h ./bldtools/oscons/xoscons
+ $(RM) $(RTSDIR)/s-oscons-tmplt.i $(RTSDIR)/s-oscons-tmplt.s
+ (cd $(RTSDIR) ; \
++ touch s-oscons.{ads,h}; \
+ $(OSCONS_CPP) ; \
+ $(OSCONS_EXTRACT) ; \
+ ../bldtools/oscons/xoscons s-oscons)
On 07/20, Nigel Taylor wrote:
> I can get past the sinfo.h error, treeprs.ads and osnames errors, but
> there are more afterwards. Too many errors to fix by hand.
>
> The problem I think lies in opening files for writing when they don't
> exist, it fails to create an empty file. So I manually touch sinfo.h to
> create the empty file. Same for other missing files.
>
> Add env FLAVOR=no_ada to the make or if using dpb lang/gcc/8,no_ada
>
>
> Not sure where the error is could be with the ada bootstrap file, needs
> regenerating.
The same problem here, please find the diff for gcc8 attached.
--
With best regards,
Pavel Korovin
No comments:
Post a Comment