Attachment 197346 Details for Bug 231584 – patch

[patch] patch

qt5-buildtools.patch (text/plain), 3.20 KB, created by Piotr Kubaj on 2018-09-22 13:10:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Piotr Kubaj

Created: 2018-09-22 13:10:46 UTC

Size: 3.20 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 480285)
>+++ Makefile	(working copy)
>@@ -8,7 +8,7 @@
> MAINTAINER=	kde@FreeBSD.org
> COMMENT=	Qt build tools
> 
>-USES=		perl5 qmake:no_env qt-dist:5,base
>+USES=		compiler:c++17-lang libtool perl5 qmake:no_env qt-dist:5,base
> HAS_CONFIGURE=	yes
> CONFIGURE_ARGS=	-no-gui -no-xcb
> USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
>@@ -19,6 +19,14 @@
> MORE_WRKSRCS=	src/tools/moc \
> 		src/tools/rcc
> 
>+.include <bsd.port.pre.mk>
>+
>+post-patch:
>+.if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64
>+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-mkspecs_common_g++-base.conf \
>+		${PATCHDIR}/extra-patch-mkspecs_common_gcc-base.conf
>+.endif
>+
> post-configure:
> .for d in src/tools/bootstrap ${MORE_WRKSRCS}
> 	${MKDIR} ${WRKSRC}/${d}
>@@ -41,4 +49,4 @@
> 	${INSTALL_SCRIPT} ${WRKSRC}/bin/syncqt.pl \
> 		${STAGEDIR}${PREFIX}/${QT_BINDIR_REL}/syncqt.pl
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>Index: files/extra-patch-mkspecs_common_g++-base.conf
>===================================================================
>--- files/extra-patch-mkspecs_common_g++-base.conf	(nonexistent)
>+++ files/extra-patch-mkspecs_common_g++-base.conf	(working copy)
>@@ -0,0 +1,20 @@
>+--- mkspecs/common/g++-base.conf.orig	2018-09-21 12:02:35 UTC
>++++ mkspecs/common/g++-base.conf
>+@@ -8,14 +8,14 @@
>+ # you can use the manual test in tests/manual/mkspecs.
>+ #
>+ 
>+-QMAKE_COMPILER          = gcc
>++QMAKE_COMPILER          = gcc7
>+ 
>+-QMAKE_CC                = gcc
>++QMAKE_CC                = gcc7
>+ 
>+ QMAKE_LINK_C            = $$QMAKE_CC
>+ QMAKE_LINK_C_SHLIB      = $$QMAKE_CC
>+ 
>+-QMAKE_CXX               = g++
>++QMAKE_CXX               = g++7
>+ 
>+ QMAKE_LINK              = $$QMAKE_CXX
>+ QMAKE_LINK_SHLIB        = $$QMAKE_CXX
>
>Property changes on: files/extra-patch-mkspecs_common_g++-base.conf
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/extra-patch-mkspecs_common_gcc-base.conf
>===================================================================
>--- files/extra-patch-mkspecs_common_gcc-base.conf	(nonexistent)
>+++ files/extra-patch-mkspecs_common_gcc-base.conf	(working copy)
>@@ -0,0 +1,11 @@
>+--- mkspecs/common/gcc-base.conf.orig	2018-09-21 12:20:28 UTC
>++++ mkspecs/common/gcc-base.conf
>+@@ -73,7 +73,7 @@ QMAKE_CXXFLAGS_LTCG        = $$QMAKE_CFLAGS_LTCG
>+ QMAKE_CXXFLAGS_LTCG_FATOBJECTS = $$QMAKE_CFLAGS_LTCG_FATOBJECTS
>+ QMAKE_CXXFLAGS_DISABLE_LTCG   = $$QMAKE_CFLAGS_DISABLE_LTCG
>+ 
>+-QMAKE_LFLAGS           +=
>++QMAKE_LFLAGS           += -Wl,-rpath=/usr/local/lib/gcc7
>+ QMAKE_LFLAGS_DEBUG     +=
>+ QMAKE_LFLAGS_APP       +=
>+ QMAKE_LFLAGS_RELEASE   +=
>
>Property changes on: files/extra-patch-mkspecs_common_gcc-base.conf
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 231584: 197346 | 197359