$OpenBSD: patch-configure,v 1.21 2011/04/03 13:35:31 dcoppa Exp $ --- configure.orig Tue Feb 22 13:02:53 2011 +++ configure Tue Mar 29 14:02:17 2011 @@ -2168,7 +2168,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 @@ -4651,7 +4651,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 @@ -4755,7 +4755,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