$OpenBSD: patch-src_qt_qtbase_mkspecs_openbsd-g++_qmake_conf,v 1.2 2017/07/14 22:15:31 sthen Exp $

Index: src/qt/qtbase/mkspecs/openbsd-g++/qmake.conf
--- src/qt/qtbase/mkspecs/openbsd-g++/qmake.conf.orig
+++ src/qt/qtbase/mkspecs/openbsd-g++/qmake.conf
@@ -5,69 +5,70 @@
 MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = openbsd bsd
 
-QMAKE_COMPILER          = gcc
+QMAKE_COMPILER          = cc
 
-QMAKE_CC                = gcc
-QMAKE_LEX               = flex
-QMAKE_LEXFLAGS          =
-QMAKE_YACC              = yacc
-QMAKE_YACCFLAGS         = -d
+include(../common/gcc-base-unix.conf)
+include(../common/unix.conf)
+
+QMAKE_CC                = cc
 QMAKE_CFLAGS            = -pipe
-QMAKE_CFLAGS_DEPS       = -M
-QMAKE_CFLAGS_WARN_ON    = -Wall -W
-QMAKE_CFLAGS_WARN_OFF   = -w
-QMAKE_CFLAGS_RELEASE    = -O2
-QMAKE_CFLAGS_DEBUG      = -g
+QMAKE_CFLAGS_DEBUG      = -O0 -g
 QMAKE_CFLAGS_SHLIB      = -fPIC
-QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
+QMAKE_CFLAGS_STATIC_LIB = -fPIC
 QMAKE_CFLAGS_YACC       = -Wno-unused -Wno-parentheses
 QMAKE_CFLAGS_THREAD     = -pthread
+QMAKE_CFLAGS_OPTIMIZE_FULL = $$QMAKE_CFLAGS_RELEASE
 
-QMAKE_CXX               = g++
+QMAKE_CXX               = c++
 QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS
+QMAKE_CXXFLAGS_CXX11	= -std=c++11
 QMAKE_CXXFLAGS_DEPS     = $$QMAKE_CFLAGS_DEPS
-QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
 QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
 QMAKE_CXXFLAGS_SHLIB    = $$QMAKE_CFLAGS_SHLIB
 QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
 QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
 QMAKE_CXXFLAGS_THREAD   = $$QMAKE_CFLAGS_THREAD
+QMAKE_CXXFLAGS_OPTIMIZE_FULL = $$QMAKE_CXXFLAGS_RELEASE
 
-QMAKE_INCDIR            = /usr/local/include
-QMAKE_LIBDIR            = /usr/local/lib
-QMAKE_INCDIR_X11        = /usr/X11R6/include
-QMAKE_LIBDIR_X11        = /usr/X11R6/lib
-QMAKE_INCDIR_OPENGL     = /usr/X11R6/include
-QMAKE_LIBDIR_OPENGL     = /usr/X11R6/lib
+LOCALBASE               = $$(LOCALBASE)
+isEmpty(LOCALBASE) {
+  LOCALBASE             = /usr/local
+}
+QMAKE_INCDIR_PREPEND    = ${OPENBSD_INCDIR_PREPEND}
+QMAKE_INCDIR            = $$LOCALBASE/include
+QMAKE_LIBDIR            = $$LOCALBASE/lib
+X11BASE                 = $$(X11BASE)
+isEmpty(X11BASE) {
+  X11BASE               = /usr/X11R6
+}
+QMAKE_INCDIR_X11        = $$X11BASE/include
+QMAKE_LIBDIR_X11        = $$X11BASE/lib
+QMAKE_INCDIR_OPENGL     = $$X11BASE/include
+QMAKE_LIBDIR_OPENGL     = $$X11BASE/lib
 
-QMAKE_LINK              = g++
-QMAKE_LINK_SHLIB        = g++
-QMAKE_LINK_C            = gcc
-QMAKE_LINK_C_SHLIB      = gcc
+QMAKE_LINK              = c++
+QMAKE_LINK_SHLIB        = c++
+QMAKE_LINK_C            = cc
+QMAKE_LINK_C_SHLIB      = cc
 QMAKE_LINK_SHLIB_CMD    = $$QMAKE_LINK_SHLIB $(LFLAGS) \
                           $$QMAKE_CFLAGS_SHLIB $$QMAKE_LFLAGS \
                           -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
 QMAKE_LFLAGS            =
 QMAKE_LFLAGS_RELEASE    =
 QMAKE_LFLAGS_DEBUG      =
-QMAKE_LFLAGS_SHLIB      = -shared
-QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME     = -Wl,-soname,
-QMAKE_LFLAGS_THREAD     = -pthread
-QMAKE_LFLAGS_NOUNDEF    = -Wl,-no_unresolved
 
+QMAKE_OPENBSD_SHLIB	= 1
+
 QMAKE_LIBS              =
 QMAKE_LIBS_DYNLOAD      =
+QMAKE_LIBS_EXECINFO     = -lexecinfo
 QMAKE_LIBS_X11          = -lXext -lX11 -lm
 QMAKE_LIBS_OPENGL       = -lGL
-QMAKE_LIBS_THREAD       =
+QMAKE_LIBS_THREAD       = -lpthread
 
 QMAKE_AR                = ar q
 QMAKE_OBJCOPY           = objcopy
 QMAKE_NM                = nm -P
 QMAKE_RANLIB            = ranlib
 
-include(../common/unix.conf)
 load(qt_config)
