85ff3a4d44
They mostly consist to make gcc-8 pose as gcc-4.9. Bump SHARED_LIBS due to an ICU-related qtcore change. While here, fix trailing whitespaces in DESCR and move HOMEPAGE to https. OK sthen@ jca@
59 lines
2.0 KiB
Plaintext
59 lines
2.0 KiB
Plaintext
$OpenBSD: patch-configure,v 1.28 2019/04/29 19:33:38 cwen Exp $
|
|
Index: configure
|
|
--- configure.orig
|
|
+++ configure
|
|
@@ -918,7 +918,7 @@ CFG_SILENT=no
|
|
CFG_GRAPHICS_SYSTEM=default
|
|
CFG_RUNTIME_SYSTEM=
|
|
CFG_ALSA=auto
|
|
-CFG_PULSEAUDIO=auto
|
|
+CFG_PULSEAUDIO=no
|
|
CFG_COREWLAN=auto
|
|
CFG_ICD=auto
|
|
CFG_NOPROCESS=no
|
|
@@ -2412,7 +2412,7 @@ while [ "$#" -gt 0 ]; do
|
|
v|verbose)
|
|
if [ "$VAL" = "yes" ]; then
|
|
if [ "$OPT_VERBOSE" = "$VAL" ]; then # takes two verboses to turn on qmake debugs
|
|
- QMAKE_SWITCHES="$QMAKE_SWITCHES -d"
|
|
+ : # QMAKE_SWITCHES="$QMAKE_SWITCHES -d"
|
|
else
|
|
OPT_VERBOSE=yes
|
|
fi
|
|
@@ -4969,7 +4969,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
|
|
EXTRA_OBJS=
|
|
EXTRA_SRCS=
|
|
EXTRA_CFLAGS="\$(QMAKE_CFLAGS)"
|
|
- EXTRA_CXXFLAGS="\$(QMAKE_CXXFLAGS)"
|
|
+ EXTRA_CXXFLAGS="\$(QMAKE_CXXFLAGS) -DLOCALBASE=\\\\\"${LOCALBASE}\\\\\" -DX11BASE=\\\\\"${X11BASE}\\\\\""
|
|
EXTRA_LFLAGS="\$(QMAKE_LFLAGS)"
|
|
|
|
if [ "$PLATFORM" = "irix-cc" ] || [ "$PLATFORM" = "irix-cc-64" ]; then
|
|
@@ -5078,7 +5078,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
|
|
done
|
|
|
|
QMAKE_BUILD_ERROR=no
|
|
- (cd "$outpath/qmake"; "$MAKE") || QMAKE_BUILD_ERROR=yes
|
|
+ (cd "$outpath/qmake"; "$MAKE" $BOOTSTRAP_MAKE_FLAGS) || QMAKE_BUILD_ERROR=yes
|
|
[ '!' -z "$QCONFIG_H" ] && mv -f "$QCONFIG_H" "$QMAKE_QCONFIG_H" #move qmake's qconfig.h to qconfig.h.qmake
|
|
[ '!' -z "$OLD_QCONFIG_H" ] && mv -f "${OLD_QCONFIG_H}.old" "$OLD_QCONFIG_H" #put back qconfig.h
|
|
[ "$QMAKE_BUILD_ERROR" = "yes" ] && exit 2
|
|
@@ -7734,7 +7734,7 @@ case "$XPLATFORM" in
|
|
*-g++*)
|
|
# Check gcc's version
|
|
case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
|
|
- 5*|4*|3.4*)
|
|
+ 8*|6*|5*|4*|3.4*)
|
|
;;
|
|
3.3*)
|
|
canBuildWebKit="no"
|
|
@@ -8050,7 +8050,7 @@ g++*)
|
|
3.*)
|
|
COMPILER_VERSION="3.*"
|
|
;;
|
|
- 5*|4.*)
|
|
+ 8*|6*|5*|4.*)
|
|
COMPILER_VERSION="4"
|
|
;;
|
|
*)
|