diff options
| author | Richard Dale <richard.dale@codethink.co.uk> | 2013-07-04 14:42:35 +0100 |
|---|---|---|
| committer | Richard Dale <richard.dale@codethink.co.uk> | 2013-07-04 14:42:35 +0100 |
| commit | 195381204c331f232a55146dd984d06da4e9c10b (patch) | |
| tree | 93e9dbe9c973ae7603dc6966dac8c226533bfd8f | |
| parent | 76f4ef510f7c8c41a4f7515934940f5de6021c52 (diff) | |
| download | qt4-tools-195381204c331f232a55146dd984d06da4e9c10b.tar.gz | |
Convert the build morph to YAML
| -rw-r--r-- | qt4-tools.morph | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/qt4-tools.morph b/qt4-tools.morph index 6e104d9f90..ae36b09599 100644 --- a/qt4-tools.morph +++ b/qt4-tools.morph @@ -1,15 +1,19 @@ -{ - "name": "qt4-tools", - "kind": "chunk", - "configure-commands": [ - "arch=$(uname -m); if [ \"${arch}\" != \"${arch//arm/}\" ]; then sed 's/g++-unix.conf)/&\nQMAKE_CXXFLAGS += -fno-strict-volatile-bitfields/' -i mkspecs/linux-g++/qmake.conf; else echo Running on x86, not modifying qmake.conf; fi", - "./configure -v -prefix /usr -opensource -confirm-license" - ], - "build-commands": [ - "make", - "LD_LIBRARY_PATH=$PWD/lib QT_PLUGIN_PATH=$PWD/plugins make docs" - ], - "install-commands": [ - "make install INSTALL_ROOT=$DESTDIR" - ] -} +name: qt4-tools +kind: chunk +# For building on ARM, gcc must be passed a -fno-strict-volatile-bitfields +# option. +configure-commands: +- | + arch=$(uname -m) + if [ "${arch}" != "${arch//arm/}" ] ; then + sed 's/g++-unix.conf)/&\nQMAKE_CXXFLAGS += -fno-strict-volatile-bitfields/' \ + -i mkspecs/linux-g++/qmake.conf + else + echo Running on x86, not modifying qmake.conf + fi +- ./configure -v -prefix /usr -opensource -confirm-license +build-commands: +- make +- LD_LIBRARY_PATH="$PWD"/lib QT_PLUGIN_PATH="$PWD"/plugins make docs +install-commands: +- make install INSTALL_ROOT="$DESTDIR" |