8ac2782675
Tested with both GCC and CLang (less through). This forces updating x11/py-qt5, which forces update of devel/py-sip, which forces update of x11/py-qt4, but, thankfully, no breakage detected.
32 lines
882 B
Plaintext
32 lines
882 B
Plaintext
$OpenBSD: patch-configure,v 1.3 2017/07/17 08:34:37 zhuk Exp $
|
|
Make bootstrap pick up CC/CXX we want.
|
|
Index: configure
|
|
--- configure.orig
|
|
+++ configure
|
|
@@ -577,7 +577,11 @@ if [ -z "$PLATFORM" ]; then
|
|
fi
|
|
;;
|
|
OpenBSD:*)
|
|
- PLATFORM=openbsd-g++
|
|
+ if cc -v 2>&1|grep -q clang; then
|
|
+ PLATFORM=openbsd-clang
|
|
+ else
|
|
+ PLATFORM=openbsd-g++
|
|
+ fi
|
|
;;
|
|
NetBSD:*)
|
|
PLATFORM=netbsd-g++
|
|
@@ -709,7 +713,11 @@ fi
|
|
# is where the resulting variable is written to
|
|
setBootstrapVariable()
|
|
{
|
|
- getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
|
|
+ if [ -n "$2" -a -n "$(eval echo \"\$$2\")" ]; then
|
|
+ echo ${2-$1} = "$(eval echo \"\$$2\")"
|
|
+ else
|
|
+ getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
|
|
+ fi
|
|
}
|
|
|
|
# build qmake
|