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/lorry | |
| 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/lorry')
| -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 |
6 files changed, 37 insertions, 1 deletions
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 |