Date: Fri, 24 May 2019 15:22:59 +0000 From: bugzilla-noreply@freebsd.org To: ports-bugs@FreeBSD.org Subject: [Bug 237745] Mk/Uses/qt-dist.mk: fix qt5 with GCC architectures Message-ID: <bug-237745-7788-RQxNGfU0Ir@https.bugs.freebsd.org/bugzilla/> In-Reply-To: <bug-237745-7788@https.bugs.freebsd.org/bugzilla/> References: <bug-237745-7788@https.bugs.freebsd.org/bugzilla/>
next in thread | previous in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D237745 Mark Millard <marklmi26-fbsd@yahoo.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |marklmi26-fbsd@yahoo.com --- Comment #7 from Mark Millard <marklmi26-fbsd@yahoo.com> --- Comment on attachment 204209 --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=3D204209 patch The line: -+EXTRA_INCLUDEPATH +=3D %%LOCALBASE%%/lib/gcc%%GCC_DEFAULT%%/include %%LOCALBASE%%/lib/gcc%%GCC_DEFAULT%%/include/c++ involves multiple %%LOCALBASE%% so the substitution needs to allow more than one substitution per line: use of "g". In my context this looks like: # svnlite diff/usr/ports/Mk/Uses/ Index: /usr/ports/Mk/Uses/qt-dist.mk =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- /usr/ports/Mk/Uses/qt-dist.mk (revision 501994) +++ /usr/ports/Mk/Uses/qt-dist.mk (working copy) @@ -251,7 +251,7 @@ .if ${_QT_VER:M5} post-patch: gcc-post-patch gcc-post-patch: - ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' \ + ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/mkspecs/common/gcc-base.conf \ ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf ${REINPLACE_CMD} 's|%%GCC_DEFAULT%%|${GCC_DEFAULT}|g' \ I and Jason Bacon were able to build devel/qt5-core with this change to how svn has things. (This does not address the oddity of some places having the optional -e and others not when there is only one sed command being fed to ${REINPLACE_CMD}.) --=20 You are receiving this mail because: You are on the CC list for the bug.=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-237745-7788-RQxNGfU0Ir>