diff options
author | James Thomas <james.thomas@codethink.co.uk> | 2015-02-16 15:18:58 +0000 |
---|---|---|
committer | James Thomas <james.thomas@codethink.co.uk> | 2015-02-16 15:18:58 +0000 |
commit | 480255744e15a59f6a78b06ec5264b00159c9ea9 (patch) | |
tree | c2e8c65d125d33712c23dfecc8c8118a798e852e | |
parent | 82235750db89247821d1f150ee1b25f44c024e9c (diff) | |
parent | a496c0b6dfeb2a3b86cb5cb14bb80b13ca3a789f (diff) | |
download | definitions-480255744e15a59f6a78b06ec5264b00159c9ea9.tar.gz |
Merge branch 'baserock/james/fix-armv7-build'
Reviewed by: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Reviewed by: Francisco Marchena <francisco.marchena@codethink.co.uk>
Reviewed by: Sam Thursfield <sam.thursfield@codethink.co.uk>
-rw-r--r-- | strata/build-essential/m4-tarball.morph | 2 | ||||
-rw-r--r-- | strata/graphics-common.morph | 1 | ||||
-rw-r--r-- | strata/graphics-common/pixman.morph | 5 |
3 files changed, 7 insertions, 1 deletions
diff --git a/strata/build-essential/m4-tarball.morph b/strata/build-essential/m4-tarball.morph index e460a9dc..eb16726a 100644 --- a/strata/build-essential/m4-tarball.morph +++ b/strata/build-essential/m4-tarball.morph @@ -2,4 +2,4 @@ name: m4-tarball kind: chunk build-system: autotools configure-commands: -- ./configure --prefix="$PREFIX" +- ./configure --prefix="$PREFIX" --disable-gcc-warnings diff --git a/strata/graphics-common.morph b/strata/graphics-common.morph index 9fc05b7c..baa935f5 100644 --- a/strata/graphics-common.morph +++ b/strata/graphics-common.morph @@ -5,6 +5,7 @@ build-depends: - morph: strata/x-common.morph chunks: - name: pixman + morph: strata/graphics-common/pixman.morph repo: upstream:pixman ref: 87eea99e443b389c978cf37efc52788bf03a0ee0 unpetrify-ref: pixman-0.32.6 diff --git a/strata/graphics-common/pixman.morph b/strata/graphics-common/pixman.morph new file mode 100644 index 00000000..d09b3df3 --- /dev/null +++ b/strata/graphics-common/pixman.morph @@ -0,0 +1,5 @@ +name: pixman +kind: chunk +build-system: autotools +configure-commands: +- ./autogen.sh --prefix="$PREFIX" --disable-arm-iwmmxt --disable-arm-iwmmxt2 |