Date: Tue, 16 Apr 2019 19:41:32 +0200 From: "Tobias C. Berner" <tcberner@gmail.com> To: Piotr Kubaj <pkubaj@freebsd.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r499101 - in head: Mk/Uses devel/qt5/files Message-ID: <CAOshKtfGaSPczrUyG6FaTmGgOrZnoaGzmGY-n8R61RH_FpHuPQ@mail.gmail.com> In-Reply-To: <201904161731.x3GHVJ1X030178@repo.freebsd.org> References: <201904161731.x3GHVJ1X030178@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Moin moin There was a little misunderstanding here. Let's see if it breaks anything or whether we get away with it. mfg Tobias On Tue, 16 Apr 2019 at 19:31, Piotr Kubaj <pkubaj@freebsd.org> wrote: > Author: pkubaj > Date: Tue Apr 16 17:31:19 2019 > New Revision: 499101 > URL: https://svnweb.freebsd.org/changeset/ports/499101 > > Log: > Fix build when using GCC. Needed by GCC architectures. > > Tested for no breakage on amd64 with Clang. > > PR: 235921 > Reviewed by: tcberner > Approved by: tcberner (mentor) > > Modified: > head/Mk/Uses/qt-dist.mk > head/devel/qt5/files/extrapatch-mkspecs_common_bsd_bsd.conf > > Modified: head/Mk/Uses/qt-dist.mk > > ============================================================================== > --- head/Mk/Uses/qt-dist.mk Tue Apr 16 17:10:02 2019 (r499100) > +++ head/Mk/Uses/qt-dist.mk Tue Apr 16 17:31:19 2019 (r499101) > @@ -251,8 +251,8 @@ _QT5_BASE= core dbus gui network sql widgets > post-patch: gcc-post-patch > gcc-post-patch: > ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' > ${WRKSRC}/mkspecs/common/gcc-base.conf > - ${REINPLACE_CMD} 's|%%GCC_DEFAULT%%|${GCC_DEFAULT}|' > ${WRKSRC}/mkspecs/common/gcc-base.conf \ > - ${WRKSRC}/mkspecs/common/g++-base.conf > + ${REINPLACE_CMD} 's|%%GCC_DEFAULT%%|${GCC_DEFAULT}|g' > ${WRKSRC}/mkspecs/common/gcc-base.conf \ > + ${WRKSRC}/mkspecs/common/g++-base.conf > ${WRKSRC}/mkspecs/common/bsd/bsd.conf > .endif > > pre-configure: qtbase-pre-configure > @@ -323,8 +323,8 @@ qt5-pre-configure: > # occurrences of ${WRKSRC}/lib from .pc and .prl files when installing > them. > # See QTBUG-40825 and ports bugs 194088, 195105 and 198720. > ${ECHO_CMD} 'QMAKE_LIBDIR_FLAGS = -L${CONFIGURE_WRKSRC}/lib' >> > ${CONFIGURE_WRKSRC}/.qmake.cache > - ${ECHO_CMD} 'QMAKE_DEFAULT_LIBDIRS = ${LOCALBASE}/lib' >> > ${CONFIGURE_WRKSRC}/.qmake.cache > - ${ECHO_CMD} 'QMAKE_DEFAULT_INCDIRS = ${LOCALBASE}/include' >> > ${CONFIGURE_WRKSRC}/.qmake.cache > + ${ECHO_CMD} 'QMAKE_DEFAULT_LIBDIRS += ${LOCALBASE}/lib /usr/lib > /lib' >> ${CONFIGURE_WRKSRC}/.qmake.cache > + ${ECHO_CMD} 'QMAKE_DEFAULT_INCDIRS += ${LOCALBASE}/include > /usr/include' >> ${CONFIGURE_WRKSRC}/.qmake.cache > > post-install: qt-post-install > qt-post-install: > > Modified: head/devel/qt5/files/extrapatch-mkspecs_common_bsd_bsd.conf > > ============================================================================== > --- head/devel/qt5/files/extrapatch-mkspecs_common_bsd_bsd.conf Tue Apr 16 > 17:10:02 2019 (r499100) > +++ head/devel/qt5/files/extrapatch-mkspecs_common_bsd_bsd.conf Tue Apr 16 > 17:31:19 2019 (r499101) > @@ -1,6 +1,6 @@ > --- mkspecs/common/bsd/bsd.conf.orig 2017-07-23 16:27:40 UTC > +++ mkspecs/common/bsd/bsd.conf > -@@ -21,6 +21,27 @@ QMAKE_LIBS_X11 = -lXext -lX11 -lm > +@@ -21,6 +21,29 @@ QMAKE_LIBS_X11 = -lXext -lX11 -lm > QMAKE_LIBS_OPENGL = -lGL > QMAKE_LIBS_THREAD = > > @@ -28,3 +28,5 @@ > QMAKE_AR = ar cqs > QMAKE_OBJCOPY = objcopy > QMAKE_NM = nm -P > ++ > ++EXTRA_INCLUDEPATH += %%LOCALBASE%%/lib/gcc%%GCC_DEFAULT%%/include > %%LOCALBASE%%/lib/gcc%%GCC_DEFAULT%%/include/c++ > >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAOshKtfGaSPczrUyG6FaTmGgOrZnoaGzmGY-n8R61RH_FpHuPQ>