View | Details | Raw Unified | Return to bug 231584 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-2 / +10 lines)
Lines 8-14 Link Here
8
MAINTAINER=	kde@FreeBSD.org
8
MAINTAINER=	kde@FreeBSD.org
9
COMMENT=	Qt build tools
9
COMMENT=	Qt build tools
10
10
11
USES=		perl5 qmake:no_env qt-dist:5,base
11
USES=		compiler:c++17-lang libtool perl5 qmake:no_env qt-dist:5,base
12
HAS_CONFIGURE=	yes
12
HAS_CONFIGURE=	yes
13
CONFIGURE_ARGS=	-no-gui -no-xcb
13
CONFIGURE_ARGS=	-no-gui -no-xcb
14
USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
14
USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
Lines 19-24 Link Here
19
MORE_WRKSRCS=	src/tools/moc \
19
MORE_WRKSRCS=	src/tools/moc \
20
		src/tools/rcc
20
		src/tools/rcc
21
21
22
.include <bsd.port.pre.mk>
23
24
post-patch:
25
.if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64
26
EXTRA_PATCHES=	${PATCHDIR}/extra-patch-mkspecs_common_g++-base.conf \
27
		${PATCHDIR}/extra-patch-mkspecs_common_gcc-base.conf
28
.endif
29
22
post-configure:
30
post-configure:
23
.for d in src/tools/bootstrap ${MORE_WRKSRCS}
31
.for d in src/tools/bootstrap ${MORE_WRKSRCS}
24
	${MKDIR} ${WRKSRC}/${d}
32
	${MKDIR} ${WRKSRC}/${d}
Lines 41-44 Link Here
41
	${INSTALL_SCRIPT} ${WRKSRC}/bin/syncqt.pl \
49
	${INSTALL_SCRIPT} ${WRKSRC}/bin/syncqt.pl \
42
		${STAGEDIR}${PREFIX}/${QT_BINDIR_REL}/syncqt.pl
50
		${STAGEDIR}${PREFIX}/${QT_BINDIR_REL}/syncqt.pl
43
51
44
.include <bsd.port.mk>
52
.include <bsd.port.post.mk>
(-)files/extra-patch-mkspecs_common_g++-base.conf (+20 lines)
Line 0 Link Here
1
--- mkspecs/common/g++-base.conf.orig	2018-09-21 12:02:35 UTC
2
+++ mkspecs/common/g++-base.conf
3
@@ -8,14 +8,14 @@
4
 # you can use the manual test in tests/manual/mkspecs.
5
 #
6
 
7
-QMAKE_COMPILER          = gcc
8
+QMAKE_COMPILER          = gcc7
9
 
10
-QMAKE_CC                = gcc
11
+QMAKE_CC                = gcc7
12
 
13
 QMAKE_LINK_C            = $$QMAKE_CC
14
 QMAKE_LINK_C_SHLIB      = $$QMAKE_CC
15
 
16
-QMAKE_CXX               = g++
17
+QMAKE_CXX               = g++7
18
 
19
 QMAKE_LINK              = $$QMAKE_CXX
20
 QMAKE_LINK_SHLIB        = $$QMAKE_CXX
(-)files/extra-patch-mkspecs_common_gcc-base.conf (+11 lines)
Line 0 Link Here
1
--- mkspecs/common/gcc-base.conf.orig	2018-09-21 12:20:28 UTC
2
+++ mkspecs/common/gcc-base.conf
3
@@ -73,7 +73,7 @@ QMAKE_CXXFLAGS_LTCG        = $$QMAKE_CFLAGS_LTCG
4
 QMAKE_CXXFLAGS_LTCG_FATOBJECTS = $$QMAKE_CFLAGS_LTCG_FATOBJECTS
5
 QMAKE_CXXFLAGS_DISABLE_LTCG   = $$QMAKE_CFLAGS_DISABLE_LTCG
6
 
7
-QMAKE_LFLAGS           +=
8
+QMAKE_LFLAGS           += -Wl,-rpath=/usr/local/lib/gcc7
9
 QMAKE_LFLAGS_DEBUG     +=
10
 QMAKE_LFLAGS_APP       +=
11
 QMAKE_LFLAGS_RELEASE   +=

Return to bug 231584