diff options
author | Edward Cragg <edward.cragg@codethink.co.uk> | 2015-02-18 17:25:10 +0000 |
---|---|---|
committer | Edward Cragg <edward.cragg@codethink.co.uk> | 2015-02-18 17:25:10 +0000 |
commit | e92ee97aa78e2db269852dd06e12e308b89b898b (patch) | |
tree | 65df3c7ef8d43f8a7e59f25e9a6f9bad6cefa4f6 /strata | |
parent | a277d26e6323891165099713290f9872716d1d3f (diff) | |
parent | 9511ddb3d2b2c8d362d06499a6b8586aae14035d (diff) | |
download | definitions-e92ee97aa78e2db269852dd06e12e308b89b898b.tar.gz |
Merge branch 'baserock/tiagogomes/armv8l64-devel'
Reviewed by:
* Sam Thursfield <sam.thursfield@codethink.co.uk>
* Richard Maw <richard.maw@gmail.com>
Diffstat (limited to 'strata')
-rw-r--r-- | strata/lorry.morph | 34 | ||||
-rw-r--r-- | strata/lorry/cvs-tarball.morph | 3 | ||||
-rw-r--r-- | strata/lorry/libapr-util.morph (renamed from strata/lorry/libapr-util-tarball.morph) | 4 | ||||
-rw-r--r-- | strata/lorry/libapr.morph | 21 | ||||
-rw-r--r-- | strata/lorry/libserf.morph | 6 | ||||
-rw-r--r-- | strata/lorry/subversion-tarball.morph | 2 | ||||
-rw-r--r-- | strata/lorry/swig-tarball.morph | 2 | ||||
-rw-r--r-- | strata/ruby/ruby-1.8.morph | 10 | ||||
-rw-r--r-- | strata/ruby/ruby.morph | 10 |
9 files changed, 65 insertions, 27 deletions
diff --git a/strata/lorry.morph b/strata/lorry.morph index 17f845cf..51ae1ccd 100644 --- a/strata/lorry.morph +++ b/strata/lorry.morph @@ -38,18 +38,19 @@ chunks: ref: ca4cd317a75ef4349563b5a9a734561beb4a4f98 unpetrify-ref: baserock/morph build-depends: [] -- name: libapr-tarball - repo: upstream:libapr-tarball - ref: dea1efeb7f60fc6848e1e72b3fc973d0057565db - unpetrify-ref: baserock/morph +- name: libapr + morph: strata/lorry/libapr.morph + repo: upstream:libapr + ref: 10835ec9a2d8bb9f7b867d15f29984d29744f028 + unpetrify-ref: 1.5.1 build-depends: [] -- name: libapr-util-tarball - morph: strata/lorry/libapr-util-tarball.morph - repo: upstream:libapr-util-tarball - ref: daba269ee5a262cc23621b3ee37ed368d2a2b69b - unpetrify-ref: baserock/morph +- name: libapr-util + morph: strata/lorry/libapr-util.morph + repo: upstream:libapr-util + ref: 718a507e2e33d87ab15ff80cfe80aea8ae6c7163 + unpetrify-ref: 1.5.4 build-depends: - - libapr-tarball + - libapr - name: perl-dbi-tarball morph: strata/lorry/perl-dbi-tarball.morph repo: upstream:perl-dbi-tarball @@ -63,12 +64,13 @@ chunks: build-depends: - perl-dbi-tarball - name: libserf-tarball + morph: strata/lorry/libserf.morph repo: upstream:libserf-tarball ref: 6f61a1acd01dc2ad1d2f5c1f7458702c77c69f9c unpetrify-ref: baserock/morph build-depends: - - libapr-tarball - - libapr-util-tarball + - libapr + - libapr-util - name: swig-tarball morph: strata/lorry/swig-tarball.morph repo: upstream:swig-tarball @@ -84,12 +86,12 @@ chunks: - name: subversion-tarball morph: strata/lorry/subversion-tarball.morph repo: upstream:subversion-tarball - ref: 351e074672d9aa6446d5829938b697a3d6b23266 - unpetrify-ref: baserock/morph + ref: baserock/tiagogomes/armv8l64-devel + unpetrify-ref: 351e074672d9aa6446d5829938b697a3d6b23266 build-depends: - swig-tarball - - libapr-tarball - - libapr-util-tarball + - libapr + - libapr-util - libserf-tarball - neon - name: mercurial-tarball diff --git a/strata/lorry/cvs-tarball.morph b/strata/lorry/cvs-tarball.morph index e8322017..5f34bc57 100644 --- a/strata/lorry/cvs-tarball.morph +++ b/strata/lorry/cvs-tarball.morph @@ -1,6 +1,9 @@ name: cvs-tarball kind: chunk build-system: autotools +pre-configure-commands: +- cp /usr/share/automake*/config.guess build-aux +- cp /usr/share/automake*/config.sub build-aux configure-commands: - YACC='bison -y' ./configure --prefix "$PREFIX" --with-external-zlib --without-gssapi --without-krb4 --disable-dependency-tracking --disable-nls --disable-rpath diff --git a/strata/lorry/libapr-util-tarball.morph b/strata/lorry/libapr-util.morph index e34e3610..26db03ba 100644 --- a/strata/lorry/libapr-util-tarball.morph +++ b/strata/lorry/libapr-util.morph @@ -1,5 +1,7 @@ -name: libapr-util-tarball +name: libapr-util kind: chunk build-system: autotools +pre-configure-commands: +- ./buildconf --with-apr=/usr/share/apr-1 configure-commands: - ./configure --prefix "$PREFIX" --with-apr=/usr/bin/apr-1-config diff --git a/strata/lorry/libapr.morph b/strata/lorry/libapr.morph new file mode 100644 index 00000000..7be0cabb --- /dev/null +++ b/strata/lorry/libapr.morph @@ -0,0 +1,21 @@ +name: libapr-tarball +kind: chunk +build-system: autotools +pre-configure-commands: +- ./buildconf +configure-commands: +- | + ./configure \ + --prefix "$PREFIX" \ + --disable-static \ + --with-installbuilddir=/usr/share/apr-1/build +post-install-commands: +- | + # Install files required for apr-util + for file in find_apr.m4 apr_common.m4 install.sh gen-build.py \ + get-version.sh config.guess config.sub + do + cp build/$file "$DESTDIR/$PREFIX"/share/apr-1/build/"$file" + done + # Create a symlink in the build directory to the include directory + ln -sf /usr/include/apr-1 "$DESTDIR/$PREFIX"/share/apr-1/build/ diff --git a/strata/lorry/libserf.morph b/strata/lorry/libserf.morph new file mode 100644 index 00000000..d4bb415d --- /dev/null +++ b/strata/lorry/libserf.morph @@ -0,0 +1,6 @@ +name: libserf +kind: chunk +build-system: autotools +pre-configure-commands: +- cp /usr/share/automake*/config.guess build +- cp /usr/share/automake*/config.sub build diff --git a/strata/lorry/subversion-tarball.morph b/strata/lorry/subversion-tarball.morph index cb416d53..8fd1bc08 100644 --- a/strata/lorry/subversion-tarball.morph +++ b/strata/lorry/subversion-tarball.morph @@ -1,6 +1,8 @@ name: subversion-tarball kind: chunk build-system: autotools +pre-configure-commands: +- LIBTOOL_CONFIG=/usr/share/libtool/build-aux/ ./autogen.sh configure-commands: - python gen-make.py build.conf - ./configure --prefix="$PREFIX" --without-berkeley-db diff --git a/strata/lorry/swig-tarball.morph b/strata/lorry/swig-tarball.morph index 61f154a4..7d16d85b 100644 --- a/strata/lorry/swig-tarball.morph +++ b/strata/lorry/swig-tarball.morph @@ -1,5 +1,7 @@ name: swig-tarball kind: chunk build-system: autotools +pre-configure-commands: +- ./autogen.sh configure-commands: - ./configure --prefix="$PREFIX" --disable-ccache diff --git a/strata/ruby/ruby-1.8.morph b/strata/ruby/ruby-1.8.morph index cee282c0..4554e441 100644 --- a/strata/ruby/ruby-1.8.morph +++ b/strata/ruby/ruby-1.8.morph @@ -1,9 +1,9 @@ name: ruby-1.8 kind: chunk -configure-commands: +build-system: autotools +pre-configure-commands: +- cp /usr/share/automake*/config.guess . +- cp /usr/share/automake*/config.sub . - autoconf +configure-commands: - ./configure --prefix=/usr --program-suffix=-1.8 -build-commands: -- make -install-commands: -- make DESTDIR="$DESTDIR" install diff --git a/strata/ruby/ruby.morph b/strata/ruby/ruby.morph index c5d4afe1..f9f0ae7c 100644 --- a/strata/ruby/ruby.morph +++ b/strata/ruby/ruby.morph @@ -1,9 +1,9 @@ name: ruby kind: chunk -configure-commands: +build-system: autotools +pre-configure-commands: +- cp /usr/share/automake*/config.guess tool +- cp /usr/share/automake*/config.sub tool - autoconf +configure-commands: - ./configure --prefix=/usr --enable-shared --with-baseruby=/usr/bin/ruby-1.8 -build-commands: -- make -install-commands: -- make DESTDIR=$DESTDIR install |