blob: 8979b3f04bfccd34e6d0df248573f292826515ab (
plain) (
blame)
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
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
|
--- build.sh.orig 2019-02-23 17:34:47 UTC
+++ build.sh
@@ -482,7 +482,7 @@ echo " Build directory: $BUILD"
mkdir -p $BUILD
# source the version script
-. $(dirname $(which $0))/version.sh
+. version.sh
# qmake needs absolute paths, so we get them now:
# OSX does not have `readlink -f` command. Use equivalent Perl script.
@@ -495,11 +495,7 @@ else
fi
if [ "$IS_MAC" = "no" ]; then
- if ( gmake -v >/dev/null 2>/dev/null ); then
MAKE_PRG=gmake
- else
- MAKE_PRG=make
- fi
else
MAKE_PRG=make
fi
@@ -521,9 +517,9 @@ cd $BUILD
# chose the right qmake
if [ $HAVE_QT5 = 0 ]; then
- export QT_SELECT=4
+ export QT_SELECT=qt4
else
- export QT_SELECT=5
+ export QT_SELECT=qt5
fi
$QMAKE -v
@@ -531,54 +527,55 @@ $QMAKE -v
# Force a minimum rebuild because of version info
touch $CURR_DIR/src/version/version.h
-qmake_options=(
+## XXX
+## CONFIG=\"$CONFIG\"
+qmake_options="
-recursive
- CONFIG+="$CONFIG"
- RUBYLIBFILE="$RUBYLIBFILE"
- RUBYINCLUDE="$RUBYINCLUDE"
- RUBYINCLUDE2="$RUBYINCLUDE2"
- RUBYVERSIONCODE="$RUBYVERSIONCODE"
- HAVE_RUBY="$HAVE_RUBY"
- PYTHONLIBFILE="$PYTHONLIBFILE"
- PYTHONINCLUDE="$PYTHONINCLUDE"
- HAVE_PYTHON="$HAVE_PYTHON"
- HAVE_QTBINDINGS="$HAVE_QTBINDINGS"
- HAVE_64BIT_COORD="$HAVE_64BIT_COORD"
- HAVE_QT5="$HAVE_QT5"
- HAVE_CURL="$HAVE_CURL"
- PREFIX="$BIN"
- RPATH="$RPATH"
- KLAYOUT_VERSION="$KLAYOUT_VERSION"
- KLAYOUT_VERSION_DATE="$KLAYOUT_VERSION_DATE"
- KLAYOUT_VERSION_REV="$KLAYOUT_VERSION_REV"
-)
+ RUBYLIBFILE=\"$RUBYLIBFILE\"
+ RUBYINCLUDE=\"$RUBYINCLUDE\"
+ RUBYINCLUDE2=\"$RUBYINCLUDE2\"
+ RUBYVERSIONCODE=\"$RUBYVERSIONCODE\"
+ HAVE_RUBY=\"$HAVE_RUBY\"
+ PYTHONLIBFILE=\"$PYTHONLIBFILE\"
+ PYTHONINCLUDE=\"$PYTHONINCLUDE\"
+ HAVE_PYTHON=\"$HAVE_PYTHON\"
+ HAVE_QTBINDINGS=\"$HAVE_QTBINDINGS\"
+ HAVE_64BIT_COORD=\"$HAVE_64BIT_COORD\"
+ HAVE_QT5=\"$HAVE_QT5\"
+ HAVE_CURL=\"$HAVE_CURL\"
+ PREFIX=\"$BIN\"
+ RPATH=\"$RPATH\"
+ KLAYOUT_VERSION=\"$KLAYOUT_VERSION\"
+ KLAYOUT_VERSION_DATE=\"$KLAYOUT_VERSION_DATE\"
+ KLAYOUT_VERSION_REV=\"$KLAYOUT_VERSION_REV\"
+"
if [ $BUILD_EXPERT = 1 ]; then
- qmake_options+=(
- QMAKE_AR="$AR cqs"
- QMAKE_LINK_C="$CC"
- QMAKE_LINK_C_SHLIB="$CC"
- QMAKE_LINK="$CXX"
- QMAKE_LINK_SHLIB="$CXX"
- QMAKE_OBJCOPY="$OBJCOPY"
+ qmake_options="$qmake_options
+ QMAKE_AR=\"$AR cqs\"
+ QMAKE_LINK_C=\"$CC\"
+ QMAKE_LINK_C_SHLIB=\"$CC\"
+ QMAKE_LINK=\"$CXX\"
+ QMAKE_LINK_SHLIB=\"$CXX\"
+ QMAKE_OBJCOPY=\"$OBJCOPY\"
QMAKE_RANLIB=
QMAKE_STRIP=
- QMAKE_CC="$CC"
- QMAKE_CXX="$CXX"
- QMAKE_CFLAGS="$CFLAGS"
+ QMAKE_CC=\"$CC\"
+ QMAKE_CXX=\"$CXX\"
+ QMAKE_CFLAGS=\"$CFLAGS\"
QMAKE_CFLAGS_RELEASE=
QMAKE_CFLAGS_DEBUG=
- QMAKE_CXXFLAGS="$CXXFLAGS"
+ QMAKE_CXXFLAGS=\"$CXXFLAGS\"
QMAKE_CXXFLAGS_RELEASE=
QMAKE_CXXFLAGS_DEBUG=
- QMAKE_LFLAGS="$LDFLAGS"
+ QMAKE_LFLAGS=\"$LDFLAGS\"
QMAKE_LFLAGS_RELEASE=
QMAKE_LFLAGS_DEBUG=
- )
+ "
fi
-echo $QMAKE "$CURR_DIR/src/klayout.pro" "${qmake_options[@]}"
-$QMAKE "$CURR_DIR/src/klayout.pro" "${qmake_options[@]}"
+echo $QMAKE "$CURR_DIR/src/klayout.pro" ${qmake_options} QMAKE_CFLAGS="$CFLAGS"
+$QMAKE "$CURR_DIR/src/klayout.pro" ${qmake_options} QMAKE_CXXFLAGS="$CXXFLAGS" QMAKE_CFLAGS="$CFLAGS" QMAKE_LFLAGS="$LDFLAGS"
cd $CURR_DIR
echo ""
|
