On Thu, Aug 13, 2020 at 05:43:19PM +0100, Stuart Henderson wrote:
> On 2020/08/13 17:56, Antoine Jacoutot wrote:
> > On Thu, Aug 13, 2020 at 05:45:18PM +0200, Matthieu Herrb wrote:
> > > Hi,
> > >
> > > while moving my machines past the llvm10 upgrade, I've found that
> > > some packages have not been automatically upgraded and still need
> > > libc++abi.so.2.1 and libc++.so.4.0 even though they don't appear
> > > anywhere in WANTLIB.
> > >
> > > On my main machine I gave up after patching the 2 ports below and
> > > removed all packages / reinstalled them to make sure there is no mix
> > > remaining.
> >
> > I have seen the same.
> > I think we're missing these is several places, I started updating some
> > ports and
> > these started to appear in WANTLIB...
>
> We should bump _SYSTEM_VERSION-* after a compiler update so we can be
> sure that people are running new binaries (otherwise there will be some
> cases they might not be updated so we won't get good feedback about
> problems introduced by the compiler change).
>
> OK?
OK aja
>
> (It's probably about time to do a big WANTLIB sync again, but it's not
> very fun though, and this will fix the real-world problem for now).
>
>
> Index: arch-defines.mk
> ===================================================================
> RCS file: /cvs/ports/infrastructure/mk/arch-defines.mk,v
> retrieving revision 1.76
> diff -u -p -r1.76 arch-defines.mk
> --- arch-defines.mk 11 Aug 2020 08:27:24 -0000 1.76
> +++ arch-defines.mk 13 Aug 2020 16:41:16 -0000
> @@ -81,12 +81,13 @@ LLD_EMUL =
>
> # system version wide specifics
> _SYSTEM_VERSION = 1
> -_SYSTEM_VERSION-aarch64 = 4
> -_SYSTEM_VERSION-amd64 = 4
> -_SYSTEM_VERSION-arm = 4
> -_SYSTEM_VERSION-i386 = 2
> -_SYSTEM_VERSION-mips64 = 1
> -_SYSTEM_VERSION-powerpc = 1
> +_SYSTEM_VERSION-aarch64 = 5
> +_SYSTEM_VERSION-amd64 = 5
> +_SYSTEM_VERSION-arm = 5
> +_SYSTEM_VERSION-i386 = 3
> +_SYSTEM_VERSION-mips64 = 2
> +_SYSTEM_VERSION-powerpc = 2
> +_SYSTEM_VERSION-powerpc64 = 1
> _SYSTEM_VERSION-${MACHINE_ARCH} ?= 0
> _SYSTEM_VERSION-${ARCH} ?= 0
>
>
>
> >
> > >
> > > diff --git x11/gnome/librsvg/Makefile x11/gnome/librsvg/Makefile
> > > index 1a356a26c35..a5dbc004e72 100644
> > > --- x11/gnome/librsvg/Makefile
> > > +++ x11/gnome/librsvg/Makefile
> > > @@ -5,6 +5,7 @@ COMMENT= SAX-based render library for SVG files
> > > GNOME_PROJECT= librsvg
> > > STABLE_VERSION= 2.48.8
> > > OLD_VERSION= 2.40.21
> > > +REVISION= 0
> > > DISTFILES= librsvg-${STABLE_VERSION}${EXTRACT_SUFX}:0 \
> > > librsvg-${OLD_VERSION}${EXTRACT_SUFX}:1
> > >
> > > @@ -45,6 +46,7 @@ WANTLIB += freetype fribidi gdk_pixbuf-2.0 gio-2.0
> > > glib-2.0
> > > WANTLIB += gmodule-2.0 gobject-2.0 graphite2 harfbuzz iconv
> > > WANTLIB += intl lzma m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre
> > > WANTLIB += pixman-1 png pthread xcb xcb-render xcb-shm xml2 z
> > > +WANTLIB += ${COMPILER_LIBCXX}
> > >
> > > MODULES= x11/gnome
> > >
> > > diff --git x11/xfce4/xfce4-session/Makefile
> > > x11/xfce4/xfce4-session/Makefile
> > > index 291c111648a..2fae6c4b639 100644
> > > --- x11/xfce4/xfce4-session/Makefile
> > > +++ x11/xfce4/xfce4-session/Makefile
> > > @@ -4,6 +4,7 @@ COMMENT= Xfce4 session manager
> > >
> > > XFCE_PROJECT= xfce4-session
> > > XFCE_VERSION= 4.14.2
> > > +REVISION= 0
> > >
> > > # GPLv2
> > > PERMIT_PACKAGE= Yes
> > > @@ -35,6 +36,7 @@ WANTLIB += startup-notification-1 wnck-3 xcb xcb-util
> > > WANTLIB += xcb-render xcb-shm xfce4ui-2 xfce4util xfconf-0 z
> > > WANTLIB += harfbuzz graphite2 polkit-gobject-1 iconv intl
> > > WANTLIB += atk-bridge-2.0 cairo-gobject epoxy gdk-3 gtk-3
> > > +WANTLIB += ${COMPILER_LIBCXX}
> > >
> > > FAKE_FLAGS= settingsdir=${PREFIX}/share/examples/xfce4-session \
> > > conffilesdir=${PREFIX}/share/examples/xfce4-session \
> > >
> > > --
> > > Matthieu Herrb
> > >
> >
> > --
> > Antoine
> >
>
--
Antoine
