Re: [ports-gcc] Unbreak geo/gpsbabel

2019-10-10 Thread Stuart Henderson
OK for post-6.6.

On 2019/10/10 11:30, Charlene Wendling wrote:
> On Thu, 10 Oct 2019 09:17:33 +0300
> Kirill Bychkov wrote:
> 
> > On Thu, October 10, 2019 02:55, Charlene Wendling wrote:
> > > Hi,
> > >
> > > I was trying to build qt5^W geo/qlandkartegt with naddy's latest
> > > fix on macppc, but i hit that:
> > >
> > >> http://build-failures.rhaalovely.net//sparc64/2019-10-06/geo/gpsbabel.log
> > >> http://build-failures.rhaalovely.net//powerpc/2019-09-17/geo/gpsbabel.log
> > >
> > > I found out that landry met the issue with print/poppler, i quote
> > > the commit [0] message:
> > >
> > >> Add ${MODGCC4_CPPLIBDEP} to LIB_DEPENDS-*, changes nothing for
> > >> clang archs, but fixes the dreaded 'Missing library for estdc+
> > >> +>=17.0' error message at pkg_create on other archs.
> > >> COMPILER_LIBCXX is in WANTLIB-*, but nothing brought it into
> > >> context, as ${MODGCC4_CPPLIBDEP} is only in LIB_DEPENDS, which
> > >> isnt inherited by LIB_DEPENDS-* here.
> > >
> > > I bumped REVISION as this version was already built during a
> > > previous macppc fix for qlandkartegt iirc.
> > >
> > > This builds fine on amd64 and macppc [1].
> > >
> > > Two ports depend on it: geo/qlandkartegt (it's still building) and
> > > geo/viking
> > >
> > > naddy, sthen: i let you decide if it's critical enough to get
> > > committed, otherwise i'll ping post-unlock :)
> > >
> > > Charl?ne.
> > >
> > >
> > > [0]
> > > https://github.com/openbsd/ports/commit/10eedd1e2cf2afea1bcbe41e374ce44fb7be4a8a
> > > [1] https://bin.charlenew.xyz/gpsbabel.missinglib.log
> > >
> > >
> [...]
> > 
> > Hi,
> > I was testing simillar diff. Looks like ${MODGCC4_CPPLIBDEP} is
> > needed only for -main and -qt.
> > 
> 
> It makes sense indeed given the WANTLIB! I tested again on macppc and
> amd64 - it builds fine.
> 
> Charlène. 
> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/geo/gpsbabel/Makefile,v
> retrieving revision 1.35
> diff -u -p -u -p -r1.35 Makefile
> --- Makefile  3 Sep 2019 13:48:25 -   1.35
> +++ Makefile  10 Oct 2019 09:07:01 -
> @@ -12,6 +12,9 @@ DISTNAME=   gpsbabel-${VERSION}
>  PKGNAME-main=gpsbabel-${VERSION}
>  PKGNAME-tk=  gpsbabel-tk-${VERSION}
>  PKGNAME-qt=  gpsbabel-qt-${VERSION}
> +REVISION-main=   0
> +REVISION-tk= 0
> +REVISION-qt= 0
>  CATEGORIES=  geo
>  
>  HOMEPAGE=https://www.gpsbabel.org/
> @@ -34,7 +37,8 @@ MULTI_PACKAGES= -main -tk -qt
>  MODULES= devel/qmake x11/tk x11/qt5
>  MODQMAKE_PROJECTS =  gui/app.pro
>  
> -LIB_DEPENDS-main=devel/libusb-compat \
> +LIB_DEPENDS-main=${MODGCC4_CPPLIBDEP} \
> + devel/libusb-compat \
>   devel/shapelib
>  
>  cWANTLIB =   c m pthread
> @@ -44,7 +48,8 @@ WANTLIB-qt += GL Qt5Core Qt5Gui Qt5Netwo
>  WANTLIB-qt += Qt5Widgets Qt5Xml ${COMPILER_LIBCXX} ${cWANTLIB}
>  
>  LIB_DEPENDS-tk=
> -LIB_DEPENDS-qt=  x11/qt5/qtwebkit
> +LIB_DEPENDS-qt=  ${MODGCC4_CPPLIBDEP} \
> + x11/qt5/qtwebkit
>  PKG_ARCH-tk= *
>  RUN_DEPENDS-tk=  geo/gpsbabel \
>   ${MODTK_RUN_DEPENDS}
> 



Re: [ports-gcc] Unbreak geo/gpsbabel

2019-10-10 Thread Charlene Wendling
On Thu, 10 Oct 2019 09:17:33 +0300
Kirill Bychkov wrote:

> On Thu, October 10, 2019 02:55, Charlene Wendling wrote:
> > Hi,
> >
> > I was trying to build qt5^W geo/qlandkartegt with naddy's latest
> > fix on macppc, but i hit that:
> >
> >> http://build-failures.rhaalovely.net//sparc64/2019-10-06/geo/gpsbabel.log
> >> http://build-failures.rhaalovely.net//powerpc/2019-09-17/geo/gpsbabel.log
> >
> > I found out that landry met the issue with print/poppler, i quote
> > the commit [0] message:
> >
> >> Add ${MODGCC4_CPPLIBDEP} to LIB_DEPENDS-*, changes nothing for
> >> clang archs, but fixes the dreaded 'Missing library for estdc+
> >> +>=17.0' error message at pkg_create on other archs.
> >> COMPILER_LIBCXX is in WANTLIB-*, but nothing brought it into
> >> context, as ${MODGCC4_CPPLIBDEP} is only in LIB_DEPENDS, which
> >> isnt inherited by LIB_DEPENDS-* here.
> >
> > I bumped REVISION as this version was already built during a
> > previous macppc fix for qlandkartegt iirc.
> >
> > This builds fine on amd64 and macppc [1].
> >
> > Two ports depend on it: geo/qlandkartegt (it's still building) and
> > geo/viking
> >
> > naddy, sthen: i let you decide if it's critical enough to get
> > committed, otherwise i'll ping post-unlock :)
> >
> > Charl?ne.
> >
> >
> > [0]
> > https://github.com/openbsd/ports/commit/10eedd1e2cf2afea1bcbe41e374ce44fb7be4a8a
> > [1] https://bin.charlenew.xyz/gpsbabel.missinglib.log
> >
> >
[...]
> 
> Hi,
> I was testing simillar diff. Looks like ${MODGCC4_CPPLIBDEP} is
> needed only for -main and -qt.
> 

It makes sense indeed given the WANTLIB! I tested again on macppc and
amd64 - it builds fine.

Charlène. 


Index: Makefile
===
RCS file: /cvs/ports/geo/gpsbabel/Makefile,v
retrieving revision 1.35
diff -u -p -u -p -r1.35 Makefile
--- Makefile3 Sep 2019 13:48:25 -   1.35
+++ Makefile10 Oct 2019 09:07:01 -
@@ -12,6 +12,9 @@ DISTNAME= gpsbabel-${VERSION}
 PKGNAME-main=  gpsbabel-${VERSION}
 PKGNAME-tk=gpsbabel-tk-${VERSION}
 PKGNAME-qt=gpsbabel-qt-${VERSION}
+REVISION-main= 0
+REVISION-tk=   0
+REVISION-qt=   0
 CATEGORIES=geo
 
 HOMEPAGE=  https://www.gpsbabel.org/
@@ -34,7 +37,8 @@ MULTI_PACKAGES=   -main -tk -qt
 MODULES=   devel/qmake x11/tk x11/qt5
 MODQMAKE_PROJECTS =gui/app.pro
 
-LIB_DEPENDS-main=  devel/libusb-compat \
+LIB_DEPENDS-main=  ${MODGCC4_CPPLIBDEP} \
+   devel/libusb-compat \
devel/shapelib
 
 cWANTLIB = c m pthread
@@ -44,7 +48,8 @@ WANTLIB-qt += GL Qt5Core Qt5Gui Qt5Netwo
 WANTLIB-qt += Qt5Widgets Qt5Xml ${COMPILER_LIBCXX} ${cWANTLIB}
 
 LIB_DEPENDS-tk=
-LIB_DEPENDS-qt=x11/qt5/qtwebkit
+LIB_DEPENDS-qt=${MODGCC4_CPPLIBDEP} \
+   x11/qt5/qtwebkit
 PKG_ARCH-tk=   *
 RUN_DEPENDS-tk=geo/gpsbabel \
${MODTK_RUN_DEPENDS}



Re: [ports-gcc] Unbreak geo/gpsbabel

2019-10-10 Thread Kirill Bychkov
On Thu, October 10, 2019 02:55, Charlene Wendling wrote:
> Hi,
>
> I was trying to build qt5^W geo/qlandkartegt with naddy's latest fix on
> macppc, but i hit that:
>
>> http://build-failures.rhaalovely.net//sparc64/2019-10-06/geo/gpsbabel.log
>> http://build-failures.rhaalovely.net//powerpc/2019-09-17/geo/gpsbabel.log
>
> I found out that landry met the issue with print/poppler, i quote the
> commit [0] message:
>
>> Add ${MODGCC4_CPPLIBDEP} to LIB_DEPENDS-*, changes nothing for clang
>> archs, but fixes the dreaded 'Missing library for estdc++>=17.0' error
>> message at pkg_create on other archs. COMPILER_LIBCXX is in WANTLIB-*,
>> but nothing brought it into context, as ${MODGCC4_CPPLIBDEP} is only in
>> LIB_DEPENDS, which isnt inherited by LIB_DEPENDS-* here.
>
> I bumped REVISION as this version was already built during a previous
> macppc fix for qlandkartegt iirc.
>
> This builds fine on amd64 and macppc [1].
>
> Two ports depend on it: geo/qlandkartegt (it's still building) and
> geo/viking
>
> naddy, sthen: i let you decide if it's critical enough to get
> committed, otherwise i'll ping post-unlock :)
>
> Charl?ne.
>
>
> [0]
> https://github.com/openbsd/ports/commit/10eedd1e2cf2afea1bcbe41e374ce44fb7be4a8a
> [1] https://bin.charlenew.xyz/gpsbabel.missinglib.log
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/geo/gpsbabel/Makefile,v
> retrieving revision 1.35
> diff -u -p -u -p -r1.35 Makefile
> --- Makefile  3 Sep 2019 13:48:25 -   1.35
> +++ Makefile  9 Oct 2019 23:41:05 -
> @@ -12,6 +12,9 @@ DISTNAME=   gpsbabel-${VERSION}
>  PKGNAME-main=gpsbabel-${VERSION}
>  PKGNAME-tk=  gpsbabel-tk-${VERSION}
>  PKGNAME-qt=  gpsbabel-qt-${VERSION}
> +REVISION-main=   0
> +REVISION-tk= 0
> +REVISION-qt= 0
>  CATEGORIES=  geo
>
>  HOMEPAGE=https://www.gpsbabel.org/
> @@ -34,7 +37,8 @@ MULTI_PACKAGES= -main -tk -qt
>  MODULES= devel/qmake x11/tk x11/qt5
>  MODQMAKE_PROJECTS =  gui/app.pro
>
> -LIB_DEPENDS-main=devel/libusb-compat \
> +LIB_DEPENDS-main=${MODGCC4_CPPLIBDEP} \
> + devel/libusb-compat \
>   devel/shapelib
>
>  cWANTLIB =   c m pthread
> @@ -43,8 +47,9 @@ WANTLIB-tk =
>  WANTLIB-qt += GL Qt5Core Qt5Gui Qt5Network Qt5WebKit Qt5WebKitWidgets
>  WANTLIB-qt += Qt5Widgets Qt5Xml ${COMPILER_LIBCXX} ${cWANTLIB}
>
> -LIB_DEPENDS-tk=
> -LIB_DEPENDS-qt=  x11/qt5/qtwebkit
> +LIB_DEPENDS-tk=  ${MODGCC4_CPPLIBDEP}
> +LIB_DEPENDS-qt=  ${MODGCC4_CPPLIBDEP} \
> + x11/qt5/qtwebkit
>  PKG_ARCH-tk= *
>  RUN_DEPENDS-tk=  geo/gpsbabel \
>   ${MODTK_RUN_DEPENDS}
>
>

Hi,
I was testing simillar diff. Looks like ${MODGCC4_CPPLIBDEP} is needed only
for -main and -qt.