On Sat, 11 Jan 2020 21:53:22 +0000
Stuart Henderson wrote:
> On 2020/01/11 21:43, Charlene Wendling wrote:
> > On Sat, 11 Jan 2020 16:46:38 +0000
> > Stuart Henderson wrote:
> >
> > > On 2020/01/11 12:36, Marc Espie wrote:
> > > > On Sat, Jan 11, 2020 at 08:50:33AM +0100, Rafael Sadowski wrote:
> > > > > Is there any way to phrase this so that we don't have fix
> > > > > version? This would save recurring updates.
> > > >
> > > > Hum... the situation with compilers is confusing enough that
> > > > having some kind of handle as to which version is which is
> > > > actually useful, as long as people remember to update.
> > > >
> > > > How about a comment in gcc/8/Makefile, reminding us to update
> > > > the version?
> > > >
> > > >
> > >
> > > How about just say "gcc 8", and put the comment in gcc/Makefile
> > > instead?
> > >
> >
> > We will still need to make changes if gcc-9 becomes ports-gcc. I see
> > your point about the location of the comment, but any location is a
> > best effort attempt to avoid having out of sync docs.
> >
> > We broke the major.minor subdirectory structure with gcc 6 and 8, so
> > gcc/Makefile (or infrastructure/mk/gcc4.port.mk) may not see
> > any modification if we bring a newer gcc-8 minor version as well.
> >
> > I'm CC'ing pascal@, in case he has plans already set up with
> > ports-gcc.
> >
> >
>
> Sure, but if bsd.port.mk just says "gcc 8" rather than "gcc 8.3" that
> is still enough to disambiguate it from base-gcc and it avoids the
> need to update the bsd.port.mk(5) manual for every minor version, we
> will only need to change it when moving from 8.x to 9.x.
>
After Pascal's mail, i think we should go with your proposal actually :)
Index: bsd.port.mk.5
===================================================================
RCS file: /cvs/src/share/man/man5/bsd.port.mk.5,v
retrieving revision 1.524
diff -u -p -r1.524 bsd.port.mk.5
--- bsd.port.mk.5 11 Jan 2020 12:43:12 -0000 1.524
+++ bsd.port.mk.5 11 Jan 2020 22:03:25 -0000
@@ -1296,7 +1296,7 @@ clang compiler from base
.It gcc3
gcc 3 compiler from base
.It ports-gcc
-gcc 8.3 compiler from ports
+gcc 8 compiler from ports
(heeds
.Ev MODGCC4_ARCHS
from the module)
@@ -1353,7 +1353,7 @@ or
still need old modules annotations, so that it's possible
to select, e.g.,
.Sq gfortran
-from gcc 8.3 while having clang from base.
+from gcc 8 while having clang from base.
See also
.Ev CHOSEN_COMPILER .
.It Ev COMPILER_LINKS
> and
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/gcc/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile 27 Apr 2019 21:26:35 -0000 1.17
+++ Makefile 11 Jan 2020 22:08:24 -0000
@@ -1,5 +1,7 @@
# $OpenBSD: Makefile,v 1.17 2019/04/27 21:26:35 naddy Exp $
+# XXX sync bsd.port.mk(5) when ports-gcc major version changes
+
SUBDIR =
SUBDIR += 8
Index: 8/Makefile
===================================================================
RCS file: /cvs/ports/lang/gcc/8/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- 8/Makefile 11 Jan 2020 12:49:46 -0000 1.29
+++ 8/Makefile 11 Jan 2020 22:08:24 -0000
@@ -15,7 +15,6 @@ USE_LLD = No
DPB_PROPERTIES = parallel
-# XXX sync bsd.port.mk(5) when the version changes
V = 8.3.0
REVISION = 4
FULL_VERSION = $V
