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

Collapse All | Expand All

(-)Makefile (-3 / +7 lines)
Lines 30-42 Link Here
30
QMAKESPEC=	freebsd-${QMAKE_COMPILER}
30
QMAKESPEC=	freebsd-${QMAKE_COMPILER}
31
INSTALL_TARGET=	sub-qmake-qmake-aux-pro-install_subtargets install_mkspecs
31
INSTALL_TARGET=	sub-qmake-qmake-aux-pro-install_subtargets install_mkspecs
32
32
33
BROKEN_powerpc64=	fails to compile: error: unrecognized command line option -std=c++11
34
35
BUILD_WRKSRC=	${WRKSRC}/${PORTNAME}
33
BUILD_WRKSRC=	${WRKSRC}/${PORTNAME}
36
34
35
.include <bsd.port.pre.mk>
36
37
post-patch:
37
post-patch:
38
# Clean up files created by patching
38
# Clean up files created by patching
39
	@${RM} ${WRKSRC}/mkspecs/*/*.orig
39
	@${RM} ${WRKSRC}/mkspecs/*/*.orig
40
.if ${ARCH} == sparc64 || ${ARCH} == mips64 || ${ARCH:Mpowerpc*}
41
EXTRA_PATCHES=	${PATCHDIR}/extra-patch-mkspecs_common_g++-base.conf \
42
		${PATCHDIR}/extra-patch-mkspecs_common_gcc-base.conf
43
.endif
40
44
41
post-build:
45
post-build:
42
# Complete configure stage to generate *.pri files.
46
# Complete configure stage to generate *.pri files.
Lines 45-48 Link Here
45
		CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" BUILD_QMAKE=1 \
49
		CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" BUILD_QMAKE=1 \
46
		${CONFIGURE_ENV} ${CONFIGURE_CMD} ${CONFIGURE_ARGS}
50
		${CONFIGURE_ENV} ${CONFIGURE_CMD} ${CONFIGURE_ARGS}
47
51
48
.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 231542