So we have a problem that gnat buildtools sometimes fail to build
(except on my machines, grr). Parallel build issues have pretty much
been ruled out.
The question is now whether egcc fails silently while producing
object code or gnatlink/gnatbind are doing something funny.
Since egcc/gnat1 gets called a lot during the build, I am leaning
towards the later.
The diff below first compiles, then binds/links the buildtools with
some ls(1) thrown in between so we can see whether the object exists at
one point or not.
Second part of this diff syncs minor changes from 4.8 to 4.7 and 4.6:
* Absolute path to strip, reduces the gnat package size by 50%
* Cpu core detection
* -j1 for the install target in 4.7, same as the rest
I plan to commit these separate, single diff is only for testing.
Comments? OK?
Index: 4.6/Makefile
===================================================================
RCS file: /home/vcs/cvs/openbsd/ports/lang/gcc/4.6/Makefile,v
retrieving revision 1.51
diff -u -p -r1.51 Makefile
--- 4.6/Makefile 21 Mar 2013 08:46:32 -0000 1.51
+++ 4.6/Makefile 14 Apr 2013 22:32:06 -0000
@@ -30,7 +30,7 @@ REVISION-estdc = 10
REVISION-f95 = 14
REVISION-java = 15
REVISION-objc = 14
-REVISION-ada = 15
+REVISION-ada = 16
REVISION-go = 14
SHARED_LIBS = estdc++ 14.0 \
@@ -116,6 +116,7 @@ EXTRA_ENV += am_cv_func_iconv=no JAR=no
EXTRA_ENV += ac_cv_prog_M4=/usr/bin/m4
EXTRA_ENV += ac_cv_header_magic_h=no
EXTRA_ENV += lt_cv_path_SED=/usr/bin/sed
+EXTRA_ENV += STRIP=/usr/bin/strip
MAKE_FLAGS += ac_cv_path_mkdir=/bin/mkdir
CONFIGURE_ENV += ${EXTRA_ENV}
Index: 4.6/patches/patch-gcc_ada_Make-generated_in
===================================================================
RCS file:
/home/vcs/cvs/openbsd/ports/lang/gcc/4.6/patches/patch-gcc_ada_Make-generated_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-gcc_ada_Make-generated_in
--- 4.6/patches/patch-gcc_ada_Make-generated_in 11 Apr 2013 08:34:13 -0000
1.2
+++ 4.6/patches/patch-gcc_ada_Make-generated_in 14 Apr 2013 22:32:06 -0000
@@ -1,26 +1,26 @@
$OpenBSD: patch-gcc_ada_Make-generated_in,v 1.2 2013/04/11 08:34:13 pascal Exp
$
--- gcc/ada/Make-generated.in.orig Sun Nov 13 15:25:58 2011
-+++ gcc/ada/Make-generated.in Thu Apr 11 09:55:36 2013
++++ gcc/ada/Make-generated.in Sun Apr 14 04:12:00 2013
@@ -27,26 +27,26 @@ $(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
- (cd $(ADA_GEN_SUBDIR)/bldtools/treeprs; gnatmake -q xtreeprs ;
./xtreeprs ../../treeprs.ads )
-+ (cd $(ADA_GEN_SUBDIR)/bldtools/treeprs; gnatmake -j1 xtreeprs ;
./xtreeprs ../../treeprs.ads )
++ (cd $(ADA_GEN_SUBDIR)/bldtools/treeprs; ls -la; gnatmake -c xtreeprs;
ls -la; gnatmake xtreeprs; ls -la; ./xtreeprs ../../treeprs.ads )
$(ADA_GEN_SUBDIR)/einfo.h : $(ADA_GEN_SUBDIR)/einfo.ads
$(ADA_GEN_SUBDIR)/einfo.adb $(ADA_GEN_SUBDIR)/xeinfo.adb
$(ADA_GEN_SUBDIR)/ceinfo.adb
-$(MKDIR) $(ADA_GEN_SUBDIR)/bldtools/einfo
$(RM) $(addprefix $(ADA_GEN_SUBDIR)/bldtools/einfo/,$(notdir $^))
$(CP) $^ $(ADA_GEN_SUBDIR)/bldtools/einfo
- (cd $(ADA_GEN_SUBDIR)/bldtools/einfo; gnatmake -q xeinfo ; ./xeinfo
../../einfo.h )
-+ (cd $(ADA_GEN_SUBDIR)/bldtools/einfo; gnatmake -j1 xeinfo ; ./xeinfo
../../einfo.h )
++ (cd $(ADA_GEN_SUBDIR)/bldtools/einfo; ls -la; gnatmake -c xeinfo; ls
-la; gnatmake xeinfo; ls -la; ./xeinfo ../../einfo.h )
$(ADA_GEN_SUBDIR)/sinfo.h : $(ADA_GEN_SUBDIR)/sinfo.ads
$(ADA_GEN_SUBDIR)/sinfo.adb $(ADA_GEN_SUBDIR)/xsinfo.adb
$(ADA_GEN_SUBDIR)/csinfo.adb
-$(MKDIR) $(ADA_GEN_SUBDIR)/bldtools/sinfo
$(RM) $(addprefix $(ADA_GEN_SUBDIR)/bldtools/sinfo/,$(notdir $^))
$(CP) $^ $(ADA_GEN_SUBDIR)/bldtools/sinfo
- (cd $(ADA_GEN_SUBDIR)/bldtools/sinfo; gnatmake -q xsinfo ; ./xsinfo
../../sinfo.h )
-+ (cd $(ADA_GEN_SUBDIR)/bldtools/sinfo; gnatmake -j1 xsinfo ; ./xsinfo
../../sinfo.h )
++ (cd $(ADA_GEN_SUBDIR)/bldtools/sinfo; ls -la; gnatmake -c xsinfo; ls
-la; gnatmake xsinfo; ls -la; ./xsinfo ../../sinfo.h )
$(ADA_GEN_SUBDIR)/snames.h $(ADA_GEN_SUBDIR)/snames.ads
$(ADA_GEN_SUBDIR)/snames.adb : $(ADA_GEN_SUBDIR)/stamp-snames ; @true
$(ADA_GEN_SUBDIR)/stamp-snames : $(ADA_GEN_SUBDIR)/snames.ads-tmpl
$(ADA_GEN_SUBDIR)/snames.adb-tmpl $(ADA_GEN_SUBDIR)/snames.h-tmpl
$(ADA_GEN_SUBDIR)/xsnamest.adb $(ADA_GEN_SUBDIR)/xutil.ads
$(ADA_GEN_SUBDIR)/xutil.adb
@@ -28,7 +28,7 @@ $OpenBSD: patch-gcc_ada_Make-generated_i
$(RM) $(addprefix $(ADA_GEN_SUBDIR)/bldtools/snamest/,$(notdir $^))
$(CP) $^ $(ADA_GEN_SUBDIR)/bldtools/snamest
- (cd $(ADA_GEN_SUBDIR)/bldtools/snamest; gnatmake -q xsnamest ;
./xsnamest )
-+ (cd $(ADA_GEN_SUBDIR)/bldtools/snamest; gnatmake -j1 xsnamest ;
./xsnamest )
++ (cd $(ADA_GEN_SUBDIR)/bldtools/snamest; ls -la; gnatmake -c xsnamest;
ls -la; gnatmake xsnamest; ls -la; ./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
$(MOVE_IF_CHANGE) $(ADA_GEN_SUBDIR)/bldtools/snamest/snames.nh
$(ADA_GEN_SUBDIR)/snames.h
@@ -37,14 +37,14 @@ $OpenBSD: patch-gcc_ada_Make-generated_i
$(RM) $(addprefix $(ADA_GEN_SUBDIR)/bldtools/nmake_b/,$(notdir $^))
$(CP) $^ $(ADA_GEN_SUBDIR)/bldtools/nmake_b
- (cd $(ADA_GEN_SUBDIR)/bldtools/nmake_b; gnatmake -q xnmake ; ./xnmake
-b ../../nmake.adb )
-+ (cd $(ADA_GEN_SUBDIR)/bldtools/nmake_b; gnatmake -j1 xnmake ; ./xnmake
-b ../../nmake.adb )
++ (cd $(ADA_GEN_SUBDIR)/bldtools/nmake_b; ls -la; gnatmake -c xnmake; ls
-la; gnatmake xnmake; ls -la; ./xnmake -b ../../nmake.adb )
$(ADA_GEN_SUBDIR)/nmake.ads : $(ADA_GEN_SUBDIR)/sinfo.ads
$(ADA_GEN_SUBDIR)/nmake.adt $(ADA_GEN_SUBDIR)/xnmake.adb
$(ADA_GEN_SUBDIR)/nmake.adb $(ADA_GEN_SUBDIR)/xutil.ads
$(ADA_GEN_SUBDIR)/xutil.adb
-$(MKDIR) $(ADA_GEN_SUBDIR)/bldtools/nmake_s
$(RM) $(addprefix $(ADA_GEN_SUBDIR)/bldtools/nmake_s/,$(notdir $^))
$(CP) $^ $(ADA_GEN_SUBDIR)/bldtools/nmake_s
- (cd $(ADA_GEN_SUBDIR)/bldtools/nmake_s; gnatmake -q xnmake ; ./xnmake
-s ../../nmake.ads )
-+ (cd $(ADA_GEN_SUBDIR)/bldtools/nmake_s; gnatmake -j1 xnmake ; ./xnmake
-s ../../nmake.ads )
++ (cd $(ADA_GEN_SUBDIR)/bldtools/nmake_s; ls -la; gnatmake -c xnmake; ls
-la; gnatmake xnmake; ls -la; ./xnmake -s ../../nmake.ads )
$(ADA_GEN_SUBDIR)/sdefault.adb: $(ADA_GEN_SUBDIR)/stamp-sdefault ; @true
$(ADA_GEN_SUBDIR)/stamp-sdefault : $(srcdir)/version.c Makefile
@@ -53,5 +53,5 @@ $OpenBSD: patch-gcc_ada_Make-generated_i
$(CP) $^ $(ADA_GEN_SUBDIR)/bldtools/gnat_hlp
(cd $(ADA_GEN_SUBDIR)/bldtools/gnat_hlp; \
- gnatmake -q vms_help; \
-+ gnatmake -j1 vms_help; \
++ ls -la; gnatmake -c vms_help; ls -la; gnatmake vms_help; ls -la; \
./vms_help$(build_exeext) gnat.help_in vms_data.ads ../../gnat.hlp)
Index: 4.6/patches/patch-gcc_ada_adaint_c
===================================================================
RCS file:
/home/vcs/cvs/openbsd/ports/lang/gcc/4.6/patches/patch-gcc_ada_adaint_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-gcc_ada_adaint_c
--- 4.6/patches/patch-gcc_ada_adaint_c 21 Feb 2012 08:09:30 -0000 1.1
+++ 4.6/patches/patch-gcc_ada_adaint_c 14 Apr 2013 22:32:06 -0000
@@ -1,7 +1,17 @@
$OpenBSD: patch-gcc_ada_adaint_c,v 1.1 2012/02/21 08:09:30 pascal Exp $
---- gcc/ada/adaint.c.orig Mon Feb 20 20:25:53 2012
-+++ gcc/ada/adaint.c Mon Feb 20 20:27:23 2012
-@@ -3686,3 +3686,9 @@ void *__gnat_lwp_self (void)
+--- gcc/ada/adaint.c.orig Mon Oct 25 17:26:02 2010
++++ gcc/ada/adaint.c Sun Apr 14 03:41:35 2013
+@@ -2384,7 +2384,8 @@ __gnat_number_of_cpus (void)
+ int cores = 1;
+
+ #if defined (linux) || defined (sun) || defined (AIX) \
+- || (defined (__alpha__) && defined (_osf_)) || defined (__APPLE__)
++ || (defined (__alpha__) && defined (_osf_)) || defined (__APPLE__) \
++ || defined(__OpenBSD__)
+ cores = (int) sysconf (_SC_NPROCESSORS_ONLN);
+
+ #elif (defined (__mips) && defined (__sgi))
+@@ -3686,3 +3687,9 @@ void *__gnat_lwp_self (void)
return (void *) syscall (__NR_gettid);
}
#endif
Index: 4.7/Makefile
===================================================================
RCS file: /home/vcs/cvs/openbsd/ports/lang/gcc/4.7/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- 4.7/Makefile 4 Apr 2013 04:21:14 -0000 1.26
+++ 4.7/Makefile 14 Apr 2013 22:32:06 -0000
@@ -31,7 +31,7 @@ REVISION-c++ = 2
REVISION-estdc = 0
REVISION-f95 = 1
REVISION-objc = 1
-REVISION-ada = 2
+REVISION-ada = 3
SHARED_LIBS = estdc++ 15.0 \
gfortran 4.0 \
@@ -117,6 +117,7 @@ EXTRA_ENV += am_cv_func_iconv=no JAR=no
EXTRA_ENV += ac_cv_prog_M4=/usr/bin/m4
EXTRA_ENV += ac_cv_header_magic_h=no
EXTRA_ENV += lt_cv_path_SED=/usr/bin/sed
+EXTRA_ENV += STRIP=/usr/bin/strip
MAKE_FLAGS += ac_cv_path_mkdir=/bin/mkdir
CONFIGURE_ENV += ${EXTRA_ENV}
Index: 4.7/patches/patch-Makefile_in
===================================================================
RCS file: /home/vcs/cvs/openbsd/ports/lang/gcc/4.7/patches/patch-Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile_in
--- 4.7/patches/patch-Makefile_in 1 Jul 2012 18:56:45 -0000 1.2
+++ 4.7/patches/patch-Makefile_in 14 Apr 2013 22:32:06 -0000
@@ -1,6 +1,15 @@
$OpenBSD: patch-Makefile_in,v 1.2 2012/07/01 18:56:45 pascal Exp $
---- Makefile.in.orig Wed May 16 17:54:24 2012
-+++ Makefile.in Wed Jun 20 14:37:41 2012
+--- Makefile.in.orig Mon Aug 6 16:34:27 2012
++++ Makefile.in Sun Apr 14 22:54:05 2013
+@@ -2295,7 +2295,7 @@ install:
+ @: $(MAKE); $(unstage)
+ @r=`${PWD_COMMAND}`; export r; \
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+- $(MAKE) $(RECURSE_FLAGS_TO_PASS) installdirs install-host install-target
++ $(MAKE) $(RECURSE_FLAGS_TO_PASS) -j1 installdirs install-host
install-target
+
+ .PHONY: install-host-nogcc
+ install-host-nogcc: \
@@ -2577,7 +2577,7 @@ configure-build-libiberty:
srcdiroption="--srcdir=$${topdir}/libiberty"; \
libsrcdir="$$s/libiberty"; \
Index: 4.7/patches/patch-gcc_ada_Make-generated_in
===================================================================
RCS file:
/home/vcs/cvs/openbsd/ports/lang/gcc/4.7/patches/patch-gcc_ada_Make-generated_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-gcc_ada_Make-generated_in
--- 4.7/patches/patch-gcc_ada_Make-generated_in 11 Apr 2013 08:34:13 -0000
1.2
+++ 4.7/patches/patch-gcc_ada_Make-generated_in 14 Apr 2013 22:32:06 -0000
@@ -1,26 +1,26 @@
$OpenBSD: patch-gcc_ada_Make-generated_in,v 1.2 2013/04/11 08:34:13 pascal Exp
$
--- gcc/ada/Make-generated.in.orig Wed Nov 23 14:53:11 2011
-+++ gcc/ada/Make-generated.in Thu Apr 11 09:59:55 2013
++++ gcc/ada/Make-generated.in Sun Apr 14 21:50:23 2013
@@ -27,26 +27,26 @@ $(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
- (cd $(ADA_GEN_SUBDIR)/bldtools/treeprs; gnatmake -q xtreeprs ;
./xtreeprs ../../treeprs.ads )
-+ (cd $(ADA_GEN_SUBDIR)/bldtools/treeprs; gnatmake -j1 xtreeprs ;
./xtreeprs ../../treeprs.ads )
++ (cd $(ADA_GEN_SUBDIR)/bldtools/treeprs; ls -la; gnatmake -c xtreeprs;
ls -la; gnatmake xtreeprs; ls -la; ./xtreeprs ../../treeprs.ads )
$(ADA_GEN_SUBDIR)/einfo.h : $(ADA_GEN_SUBDIR)/einfo.ads
$(ADA_GEN_SUBDIR)/einfo.adb $(ADA_GEN_SUBDIR)/xeinfo.adb
$(ADA_GEN_SUBDIR)/ceinfo.adb
-$(MKDIR) $(ADA_GEN_SUBDIR)/bldtools/einfo
$(RM) $(addprefix $(ADA_GEN_SUBDIR)/bldtools/einfo/,$(notdir $^))
$(CP) $^ $(ADA_GEN_SUBDIR)/bldtools/einfo
- (cd $(ADA_GEN_SUBDIR)/bldtools/einfo; gnatmake -q xeinfo ; ./xeinfo
../../einfo.h )
-+ (cd $(ADA_GEN_SUBDIR)/bldtools/einfo; gnatmake -j1 xeinfo ; ./xeinfo
../../einfo.h )
++ (cd $(ADA_GEN_SUBDIR)/bldtools/einfo; ls -la; gnatmake -c xeinfo; ls
-la; gnatmake xeinfo; ls -la; ./xeinfo ../../einfo.h )
$(ADA_GEN_SUBDIR)/sinfo.h : $(ADA_GEN_SUBDIR)/sinfo.ads
$(ADA_GEN_SUBDIR)/sinfo.adb $(ADA_GEN_SUBDIR)/xsinfo.adb
$(ADA_GEN_SUBDIR)/csinfo.adb
-$(MKDIR) $(ADA_GEN_SUBDIR)/bldtools/sinfo
$(RM) $(addprefix $(ADA_GEN_SUBDIR)/bldtools/sinfo/,$(notdir $^))
$(CP) $^ $(ADA_GEN_SUBDIR)/bldtools/sinfo
- (cd $(ADA_GEN_SUBDIR)/bldtools/sinfo; gnatmake -q xsinfo ; ./xsinfo
../../sinfo.h )
-+ (cd $(ADA_GEN_SUBDIR)/bldtools/sinfo; gnatmake -j1 xsinfo ; ./xsinfo
../../sinfo.h )
++ (cd $(ADA_GEN_SUBDIR)/bldtools/sinfo; ls -la; gnatmake -c xsinfo; ls
-la; gnatmake xsinfo; ls -la; ./xsinfo ../../sinfo.h )
$(ADA_GEN_SUBDIR)/snames.h $(ADA_GEN_SUBDIR)/snames.ads
$(ADA_GEN_SUBDIR)/snames.adb : $(ADA_GEN_SUBDIR)/stamp-snames ; @true
$(ADA_GEN_SUBDIR)/stamp-snames : $(ADA_GEN_SUBDIR)/snames.ads-tmpl
$(ADA_GEN_SUBDIR)/snames.adb-tmpl $(ADA_GEN_SUBDIR)/snames.h-tmpl
$(ADA_GEN_SUBDIR)/xsnamest.adb $(ADA_GEN_SUBDIR)/xutil.ads
$(ADA_GEN_SUBDIR)/xutil.adb
@@ -28,7 +28,7 @@ $OpenBSD: patch-gcc_ada_Make-generated_i
$(RM) $(addprefix $(ADA_GEN_SUBDIR)/bldtools/snamest/,$(notdir $^))
$(CP) $^ $(ADA_GEN_SUBDIR)/bldtools/snamest
- (cd $(ADA_GEN_SUBDIR)/bldtools/snamest; gnatmake -q xsnamest ;
./xsnamest )
-+ (cd $(ADA_GEN_SUBDIR)/bldtools/snamest; gnatmake -j1 xsnamest ;
./xsnamest )
++ (cd $(ADA_GEN_SUBDIR)/bldtools/snamest; ls -la; gnatmake -c xsnamest;
ls -la; gnatmake xsnamest; ls -la; ./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
$(MOVE_IF_CHANGE) $(ADA_GEN_SUBDIR)/bldtools/snamest/snames.nh
$(ADA_GEN_SUBDIR)/snames.h
@@ -37,14 +37,14 @@ $OpenBSD: patch-gcc_ada_Make-generated_i
$(RM) $(addprefix $(ADA_GEN_SUBDIR)/bldtools/nmake_b/,$(notdir $^))
$(CP) $^ $(ADA_GEN_SUBDIR)/bldtools/nmake_b
- (cd $(ADA_GEN_SUBDIR)/bldtools/nmake_b; gnatmake -q xnmake ; ./xnmake
-b ../../nmake.adb )
-+ (cd $(ADA_GEN_SUBDIR)/bldtools/nmake_b; gnatmake -j1 xnmake ; ./xnmake
-b ../../nmake.adb )
++ (cd $(ADA_GEN_SUBDIR)/bldtools/nmake_b; ls -la; gnatmake -c xnmake; ls
-la; gnatmake xnmake; ls -la; ./xnmake -b ../../nmake.adb )
$(ADA_GEN_SUBDIR)/nmake.ads : $(ADA_GEN_SUBDIR)/sinfo.ads
$(ADA_GEN_SUBDIR)/nmake.adt $(ADA_GEN_SUBDIR)/xnmake.adb
$(ADA_GEN_SUBDIR)/nmake.adb $(ADA_GEN_SUBDIR)/xutil.ads
$(ADA_GEN_SUBDIR)/xutil.adb
-$(MKDIR) $(ADA_GEN_SUBDIR)/bldtools/nmake_s
$(RM) $(addprefix $(ADA_GEN_SUBDIR)/bldtools/nmake_s/,$(notdir $^))
$(CP) $^ $(ADA_GEN_SUBDIR)/bldtools/nmake_s
- (cd $(ADA_GEN_SUBDIR)/bldtools/nmake_s; gnatmake -q xnmake ; ./xnmake
-s ../../nmake.ads )
-+ (cd $(ADA_GEN_SUBDIR)/bldtools/nmake_s; gnatmake -j1 xnmake ; ./xnmake
-s ../../nmake.ads )
++ (cd $(ADA_GEN_SUBDIR)/bldtools/nmake_s; ls -la; gnatmake -c xnmake; ls
-la; gnatmake xnmake; ls -la; ./xnmake -s ../../nmake.ads )
$(ADA_GEN_SUBDIR)/sdefault.adb: $(ADA_GEN_SUBDIR)/stamp-sdefault ; @true
$(ADA_GEN_SUBDIR)/stamp-sdefault : $(srcdir)/version.c Makefile
@@ -53,5 +53,5 @@ $OpenBSD: patch-gcc_ada_Make-generated_i
$(CP) $^ $(ADA_GEN_SUBDIR)/bldtools/gnat_hlp
(cd $(ADA_GEN_SUBDIR)/bldtools/gnat_hlp; \
- gnatmake -q vms_help; \
-+ gnatmake -j1 vms_help; \
++ ls -la; gnatmake -c vms_help; ls -la; gnatmake vms_help; ls -la; \
./vms_help$(build_exeext) gnat.help_in vms_data.ads ../../gnat.hlp)
Index: 4.7/patches/patch-gcc_ada_adaint_c
===================================================================
RCS file:
/home/vcs/cvs/openbsd/ports/lang/gcc/4.7/patches/patch-gcc_ada_adaint_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-gcc_ada_adaint_c
--- 4.7/patches/patch-gcc_ada_adaint_c 23 Apr 2012 15:56:41 -0000 1.1.1.1
+++ 4.7/patches/patch-gcc_ada_adaint_c 14 Apr 2013 22:32:06 -0000
@@ -1,7 +1,17 @@
$OpenBSD: patch-gcc_ada_adaint_c,v 1.1.1.1 2012/04/23 15:56:41 pascal Exp $
--- gcc/ada/adaint.c.orig Wed Dec 21 14:34:12 2011
-+++ gcc/ada/adaint.c Sat Apr 14 18:09:40 2012
-@@ -3869,3 +3869,9 @@ void __gnat_cpu_set (int cpu, size_t count ATTRIBUTE_U
++++ gcc/ada/adaint.c Sun Apr 14 03:43:03 2013
+@@ -2468,7 +2468,8 @@ __gnat_number_of_cpus (void)
+ int cores = 1;
+
+ #if defined (linux) || defined (sun) || defined (AIX) \
+- || (defined (__alpha__) && defined (_osf_)) || defined (__APPLE__)
++ || (defined (__alpha__) && defined (_osf_)) || defined (__APPLE__) \
++ || defined(__OpenBSD__)
+ cores = (int) sysconf (_SC_NPROCESSORS_ONLN);
+
+ #elif (defined (__mips) && defined (__sgi))
+@@ -3869,3 +3870,9 @@ void __gnat_cpu_set (int cpu, size_t count ATTRIBUTE_U
#ifdef __cplusplus
}
#endif
Index: 4.8/patches/patch-gcc_ada_Make-generated_in
===================================================================
RCS file:
/home/vcs/cvs/openbsd/ports/lang/gcc/4.8/patches/patch-gcc_ada_Make-generated_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-gcc_ada_Make-generated_in
--- 4.8/patches/patch-gcc_ada_Make-generated_in 11 Apr 2013 08:34:13 -0000
1.2
+++ 4.8/patches/patch-gcc_ada_Make-generated_in 14 Apr 2013 22:32:06 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-gcc_ada_Make-generated_in,v 1.2 2013/04/11 08:34:13 pascal Exp
$
--- gcc/ada/Make-generated.in.orig Wed Dec 5 12:02:24 2012
-+++ gcc/ada/Make-generated.in Mon Apr 8 23:20:57 2013
++++ gcc/ada/Make-generated.in Sun Apr 14 21:59:15 2013
@@ -28,21 +28,21 @@ $(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
- (cd $(ADA_GEN_SUBDIR)/bldtools/treeprs; gnatmake -q xtreeprs ;
./xtreeprs treeprs.ads )
-+ (cd $(ADA_GEN_SUBDIR)/bldtools/treeprs; gnatmake -j1 xtreeprs ;
./xtreeprs treeprs.ads )
++ (cd $(ADA_GEN_SUBDIR)/bldtools/treeprs; ls -la; gnatmake -c xtreeprs;
ls -la; gnatmake xtreeprs; ls -la; ./xtreeprs treeprs.ads )
$(MOVE_IF_CHANGE) $(ADA_GEN_SUBDIR)/bldtools/treeprs/treeprs.ads
$(ADA_GEN_SUBDIR)/treeprs.ads
$(ADA_GEN_SUBDIR)/einfo.h : $(ADA_GEN_SUBDIR)/einfo.ads
$(ADA_GEN_SUBDIR)/einfo.adb $(ADA_GEN_SUBDIR)/xeinfo.adb
$(ADA_GEN_SUBDIR)/ceinfo.adb
@@ -14,7 +14,7 @@ $OpenBSD: patch-gcc_ada_Make-generated_i
$(RM) $(addprefix $(ADA_GEN_SUBDIR)/bldtools/einfo/,$(notdir $^))
$(CP) $^ $(ADA_GEN_SUBDIR)/bldtools/einfo
- (cd $(ADA_GEN_SUBDIR)/bldtools/einfo; gnatmake -q xeinfo ; ./xeinfo
einfo.h )
-+ (cd $(ADA_GEN_SUBDIR)/bldtools/einfo; gnatmake -j1 xeinfo ; ./xeinfo
einfo.h )
++ (cd $(ADA_GEN_SUBDIR)/bldtools/einfo; ls -la; gnatmake -c xeinfo; ls
-la; gnatmake xeinfo; ls -la; ./xeinfo einfo.h )
$(MOVE_IF_CHANGE) $(ADA_GEN_SUBDIR)/bldtools/einfo/einfo.h
$(ADA_GEN_SUBDIR)/einfo.h
$(ADA_GEN_SUBDIR)/sinfo.h : $(ADA_GEN_SUBDIR)/sinfo.ads
$(ADA_GEN_SUBDIR)/sinfo.adb $(ADA_GEN_SUBDIR)/xsinfo.adb
$(ADA_GEN_SUBDIR)/csinfo.adb
@@ -22,7 +22,7 @@ $OpenBSD: patch-gcc_ada_Make-generated_i
$(RM) $(addprefix $(ADA_GEN_SUBDIR)/bldtools/sinfo/,$(notdir $^))
$(CP) $^ $(ADA_GEN_SUBDIR)/bldtools/sinfo
- (cd $(ADA_GEN_SUBDIR)/bldtools/sinfo; gnatmake -q xsinfo ; ./xsinfo
sinfo.h )
-+ (cd $(ADA_GEN_SUBDIR)/bldtools/sinfo; gnatmake -j1 xsinfo ; ./xsinfo
sinfo.h )
++ (cd $(ADA_GEN_SUBDIR)/bldtools/sinfo; ls -la; gnatmake -c xsinfo; ls
-la; gnatmake xsinfo; ls -la; ./xsinfo sinfo.h )
$(MOVE_IF_CHANGE) $(ADA_GEN_SUBDIR)/bldtools/sinfo/sinfo.h
$(ADA_GEN_SUBDIR)/sinfo.h
$(ADA_GEN_SUBDIR)/snames.h $(ADA_GEN_SUBDIR)/snames.ads
$(ADA_GEN_SUBDIR)/snames.adb : $(ADA_GEN_SUBDIR)/stamp-snames ; @true
@@ -31,7 +31,7 @@ $OpenBSD: patch-gcc_ada_Make-generated_i
$(RM) $(addprefix $(ADA_GEN_SUBDIR)/bldtools/snamest/,$(notdir $^))
$(CP) $^ $(ADA_GEN_SUBDIR)/bldtools/snamest
- (cd $(ADA_GEN_SUBDIR)/bldtools/snamest; gnatmake -q xsnamest ;
./xsnamest )
-+ (cd $(ADA_GEN_SUBDIR)/bldtools/snamest; gnatmake -j1 xsnamest ;
./xsnamest )
++ (cd $(ADA_GEN_SUBDIR)/bldtools/snamest; ls -la; gnatmake -c xsnamest;
ls -la; gnatmake xsnamest; ls -la; ./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
$(MOVE_IF_CHANGE) $(ADA_GEN_SUBDIR)/bldtools/snamest/snames.nh
$(ADA_GEN_SUBDIR)/snames.h
@@ -40,7 +40,7 @@ $OpenBSD: patch-gcc_ada_Make-generated_i
$(RM) $(addprefix $(ADA_GEN_SUBDIR)/bldtools/nmake/,$(notdir $^))
$(CP) $^ $(ADA_GEN_SUBDIR)/bldtools/nmake
- (cd $(ADA_GEN_SUBDIR)/bldtools/nmake; gnatmake -q xnmake ; ./xnmake -b
nmake.adb ; ./xnmake -s nmake.ads)
-+ (cd $(ADA_GEN_SUBDIR)/bldtools/nmake; gnatmake -j1 xnmake ; ./xnmake -b
nmake.adb ; ./xnmake -s nmake.ads)
++ (cd $(ADA_GEN_SUBDIR)/bldtools/nmake; ls -la; gnatmake -c xnmake; ls
-la; gnatmake xnmake; ls -la; ./xnmake -b nmake.adb ; ./xnmake -s nmake.ads)
$(MOVE_IF_CHANGE) $(ADA_GEN_SUBDIR)/bldtools/nmake/nmake.ads
$(ADA_GEN_SUBDIR)/nmake.ads
$(MOVE_IF_CHANGE) $(ADA_GEN_SUBDIR)/bldtools/nmake/nmake.adb
$(ADA_GEN_SUBDIR)/nmake.adb
touch $(ADA_GEN_SUBDIR)/stamp-nmake
@@ -49,7 +49,7 @@ $OpenBSD: patch-gcc_ada_Make-generated_i
$(RM) $(addprefix $(ADA_GEN_SUBDIR)/bldtools/oscons/,$(notdir $^))
$(CP) $^ $(ADA_GEN_SUBDIR)/bldtools/oscons
- (cd $(ADA_GEN_SUBDIR)/bldtools/oscons ; gnatmake -q xoscons ; \
-+ (cd $(ADA_GEN_SUBDIR)/bldtools/oscons ; gnatmake -j1 xoscons ; \
++ (cd $(ADA_GEN_SUBDIR)/bldtools/oscons ; ls -la; gnatmake -c xoscons; ls
-la; gnatmake xoscons; ls -la; \
$(RM) s-oscons-tmplt.i s-oscons-tmplt.s ; \
$(OSCONS_CPP) ; \
$(OSCONS_EXTRACT) ; \
@@ -58,5 +58,5 @@ $OpenBSD: patch-gcc_ada_Make-generated_i
$(CP) $^ $(ADA_GEN_SUBDIR)/bldtools/gnat_hlp
(cd $(ADA_GEN_SUBDIR)/bldtools/gnat_hlp; \
- gnatmake -q vms_help; \
-+ gnatmake -j1 vms_help; \
++ ls -la; gnatmake -c vms_help; ls -la; gnatmake vms_help; ls -la; \
./vms_help$(build_exeext) gnat.help_in vms_data.ads ../../gnat.hlp)
