On Sun 10 May 2020 at 12:44:39 +0100, Jonathan Perkin wrote:
> * On 2020-05-10 at 12:26 BST, Olaf Seibert wrote:
>
> > ## The PKGREVISION of this package needs to be at least 1 more than the
> > ## PKGREVISION of the lang/gcc8 package so that with the dependence pattern
> > ## '{gcc8,gcc8-libs}>=8.2.*' pkg_add will choose gcc8-libs over gcc8.
>
> It's probably worth revisiting why we even support this. I don't
> think it actually works, given that the libraries are installed into
> different places, and I don't remember why it was added in the first
> place.
>
> For our gcc9 packages I dropped it, though we always enable
> USE_PKGSRC_GCC_RUNTIME anyway. It's likely that when I committed
> this:
>
> https://github.com/NetBSD/pkgsrc/commit/9dbcceee
>
> I should have made the non-runtime case avoid the -libs package, and
> it's been cargo-culted around ever since.
I grepped through my whole pkgsrc tree, and it was used a few times in
BUILDLINK_API_DEPENDS values:
./lang/gcc5-libs/buildlink3.mk:BUILDLINK_API_DEPENDS.gcc5-libs+= {gcc5,gcc5-libs}>=5.1.0
./lang/gcc6-libs/buildlink3.mk:BUILDLINK_API_DEPENDS.gcc6-libs+= {gcc6,gcc6-libs}>=6.1.0
./lang/gcc7-libs/buildlink3.mk:BUILDLINK_API_DEPENDS.gcc7-libs+= {gcc7,gcc7-libs}>=7.5.0
./lang/gcc8-libs/buildlink3.mk:BUILDLINK_API_DEPENDS.gcc8-libs+= {gcc8,gcc8-libs}>=8.3.0
in the context of a conditional:
.if !empty(USE_PKGSRC_GCC_RUNTIME:M[Yy][Ee][Ss])
BUILDLINK_API_DEPENDS.gcc7-libs+= gcc7-libs>=7.5.0
.else
BUILDLINK_API_DEPENDS.gcc7-libs+= {gcc7,gcc7-libs}>=7.5.0
.endif
and a few times it was commented out:
./lang/gcc5/buildlink3.mk:#ABI_DEPENDS+= {gcc5,gcc5-libs}>=5.1.0:../../lang/gcc5-libs
./lang/gcc6/buildlink3.mk:#ABI_DEPENDS+= {gcc6,gcc6-libs}>=6.0:../../lang/gcc6-libs
in this conditional context:
# Packages that link against shared libraries need a full dependency.
#.if defined(_USE_GCC_SHLIB)
#DEPENDS+= {gcc6, gcc6-libs}>=${_GCC_REQD}:../../lang/gcc6-libs
#ABI_DEPENDS+= {gcc6,gcc6-libs}>=6.0:../../lang/gcc6-libs
#.endif
and mentioned in some of the Makefiles, like the one I quoted:
./lang/gcc5-libs/Makefile:## '{gcc5,gcc5-libs}>=5.1.*' pkg_add will choose gcc5-libs over gcc5.
./lang/gcc6-libs/Makefile:## '{gcc6,gcc6-libs}>=6.1.*' pkg_add will choose gcc6-libs over gcc6.
./lang/gcc7-libs/Makefile:## '{gcc7,gcc7-libs}>=7.5.*' pkg_add will choose gcc7-libs over gcc7.
./lang/gcc8-libs/Makefile:## '{gcc8,gcc8-libs}>=8.2.*' pkg_add will choose gcc8-libs over gcc8.
-Olaf.
--
Olaf 'Rhialto' Seibert -- rhialto at falu dot nl
___ Anyone who is capable of getting themselves made President should on
\X/ no account be allowed to do the job. --Douglas Adams, "THGTTG"
Attachment:
signature.asc
Description: PGP signature