From 2b10a9677817377618e33d2b07ab7caefe316633 Mon Sep 17 00:00:00 2001
From: Richard Maw <richard.maw@codethink.co.uk>
Date: Mon, 18 Aug 2014 17:05:22 +0000
Subject: Re-organise definitions with scripts/organise-morphologies.py

---
 strata/qt4-tools/icu.morph       |  8 ++++++++
 strata/qt4-tools/qt4-tools.morph | 18 ++++++++++++++++++
 strata/qt4-tools/ruby-1.8.morph  |  9 +++++++++
 strata/qt4-tools/ruby-1.9.morph  |  9 +++++++++
 4 files changed, 44 insertions(+)
 create mode 100644 strata/qt4-tools/icu.morph
 create mode 100644 strata/qt4-tools/qt4-tools.morph
 create mode 100644 strata/qt4-tools/ruby-1.8.morph
 create mode 100644 strata/qt4-tools/ruby-1.9.morph

(limited to 'strata/qt4-tools')

diff --git a/strata/qt4-tools/icu.morph b/strata/qt4-tools/icu.morph
new file mode 100644
index 00000000..37dec07e
--- /dev/null
+++ b/strata/qt4-tools/icu.morph
@@ -0,0 +1,8 @@
+name: icu
+kind: chunk
+configure-commands:
+- cd source; ./runConfigureICU Linux --prefix=/usr
+build-commands:
+- cd source; unset TARGET ; make
+install-commands:
+- cd source; unset TARGET ; make DESTDIR="$DESTDIR" install
diff --git a/strata/qt4-tools/qt4-tools.morph b/strata/qt4-tools/qt4-tools.morph
new file mode 100644
index 00000000..bc4cc17e
--- /dev/null
+++ b/strata/qt4-tools/qt4-tools.morph
@@ -0,0 +1,18 @@
+name: qt4-tools
+kind: chunk
+max-jobs: 1
+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"
diff --git a/strata/qt4-tools/ruby-1.8.morph b/strata/qt4-tools/ruby-1.8.morph
new file mode 100644
index 00000000..cee282c0
--- /dev/null
+++ b/strata/qt4-tools/ruby-1.8.morph
@@ -0,0 +1,9 @@
+name: ruby-1.8
+kind: chunk
+configure-commands:
+- autoconf
+- ./configure --prefix=/usr --program-suffix=-1.8
+build-commands:
+- make
+install-commands:
+- make DESTDIR="$DESTDIR" install
diff --git a/strata/qt4-tools/ruby-1.9.morph b/strata/qt4-tools/ruby-1.9.morph
new file mode 100644
index 00000000..bc697ada
--- /dev/null
+++ b/strata/qt4-tools/ruby-1.9.morph
@@ -0,0 +1,9 @@
+name: ruby-1.9
+kind: chunk
+configure-commands:
+- autoconf
+- ./configure --prefix=/usr --enable-shared --with-baseruby=/usr/bin/ruby-1.8
+build-commands:
+- make
+install-commands:
+- make DESTDIR="$DESTDIR" install
-- 
cgit v1.2.1