31 lines
1.5 KiB
Plaintext
31 lines
1.5 KiB
Plaintext
$OpenBSD: patch-configure,v 1.20 2010/10/28 14:55:47 espie Exp $
|
|
--- configure.orig Fri Sep 10 11:04:46 2010
|
|
+++ configure Sun Oct 24 12:32:06 2010
|
|
@@ -2085,7 +2085,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
|
|
@@ -4516,7 +4516,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
|
|
@@ -4620,7 +4620,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
|