clang 6 is full of surprises. Fix build on 12-CURRENT 1200056.
This commit is contained in:
parent
6cbed8f227
commit
8fa1f4b0e2
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=459218
2 changed files with 8 additions and 14 deletions
|
@ -4,7 +4,7 @@
|
|||
PORTNAME= fwbuilder
|
||||
PORTVERSION= 5.1.0
|
||||
DISTVERSIONSUFFIX= .${BUILD}
|
||||
PORTREVISION= 3
|
||||
PORTREVISION= 4
|
||||
CATEGORIES= security
|
||||
MASTER_SITES= SF/${PORTNAME}/Current_Packages/${PORTVERSION}
|
||||
|
||||
|
@ -45,6 +45,7 @@ GNU_CONFIGURE= yes
|
|||
CONFIGURE_ENV= QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ \
|
||||
INSTALL_ROOT=${STAGEDIR}
|
||||
CPPFLAGS+= -I${LOCALBASE}/include
|
||||
CXXFLAGS+= -Wno-reserved-user-defined-literal
|
||||
LDFLAGS+= -L${LOCALBASE}/lib
|
||||
CONFIGURE_ARGS= --with-docdir=${DOCSDIR} --with-qtdir=${QTDIR} \
|
||||
--prefix=${PREFIX}
|
||||
|
|
|
@ -1,14 +1,6 @@
|
|||
--- qmake.inc.in.orig 2011-04-20 10:48:53.000000000 -0700
|
||||
+++ qmake.inc.in 2011-05-08 13:57:57.471497111 -0700
|
||||
@@ -17,7 +17,6 @@
|
||||
|
||||
# CONFIG -= nostrip
|
||||
# CONFIG += release
|
||||
-CONFIG += debug
|
||||
|
||||
unix {
|
||||
PREFIX = @PREFIX@
|
||||
@@ -35,11 +34,6 @@
|
||||
--- qmake.inc.in.orig 2012-03-22 23:10:54.000000000 -0700
|
||||
+++ qmake.inc.in 2018-01-16 19:10:57.908531000 -0800
|
||||
@@ -35,10 +35,8 @@
|
||||
MOC_DIR = .moc
|
||||
OBJECTS_DIR = .obj
|
||||
|
||||
|
@ -16,7 +8,8 @@
|
|||
- QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
|
||||
- QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter
|
||||
- QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter
|
||||
-
|
||||
+ QMAKE_CXXFLAGS_DEBUG += -Wno-reserved-user-defined-literal
|
||||
+ QMAKE_CXXFLAGS_RELEASE += -Wno-reserved-user-defined-literal
|
||||
|
||||
!macx {
|
||||
|
||||
exec_prefix = @EXEC_PREFIX@
|
||||
|
|
Loading…
Reference in a new issue