1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
From d943c04c4e87a8a0b2ea8d2cd1540581d3ed8717 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Wed, 31 Jan 2018 15:10:51 +0100
Subject: [PATCH 1/2] Build: allow to skip implicit configure call
---
autogen.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/autogen.sh b/autogen.sh
index 6d8c49690..da2f79f0f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -48,4 +48,4 @@ which acinclude >/dev/null 2>&1 && acinclude
which aclocal >/dev/null 2>&1 && aclocal
autoconf
-./configure ${CFGARGS} $*
+test -n "$NOCONFIGURE" || ./configure ${CFGARGS} $*
From d4b8f9127dd2926cca889869732dd167c78b9edd Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Wed, 31 Jan 2018 15:11:07 +0100
Subject: [PATCH 2/2] Build: fix script to handle potential empty $FLAGS
In case $FLAGS is empty, the original command would have been
qmake "" -recursive
qmake interpretes "" as the first parameter that should point to a filename, if given
---
runqmake.sh | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/runqmake.sh b/runqmake.sh
index 7db4571bc..8fb8958ec 100755
--- a/runqmake.sh
+++ b/runqmake.sh
@@ -13,5 +13,10 @@ IFS="
test -z "$EXTRA_CXXFLAGS" || FLAGS="QMAKE_CXXFLAGS += $EXTRA_CXXFLAGS"
-$QMAKE "$FLAGS" $C
+if [ -z "$FLAGS" ]; then
+ # in case there are no FLAGS defined, we can't pass an empty "" parameter to qmake
+ $QMAKE $C
+else
+ $QMAKE "$FLAGS" $C
+fi
|
