0b3aa0cfeb
- for gcc4, insist on -fno-wrapv, since it breaks things. - use atomic builtins as they are available (on i386 at least) - remove a few reasons why gmake is required (but not all) - pass MAKE_JOBS to configure step.
22 lines
1.0 KiB
Plaintext
22 lines
1.0 KiB
Plaintext
$OpenBSD: patch-configure,v 1.18 2010/05/23 10:36:49 espie Exp $
|
|
--- configure.orig Thu Feb 11 16:55:17 2010
|
|
+++ configure Mon May 17 22:38:44 2010
|
|
@@ -2013,7 +2013,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
|
|
@@ -4455,7 +4455,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
|