diff options
| author | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2015-02-13 16:14:48 +0000 |
|---|---|---|
| committer | Edward Cragg <edward.cragg@codethink.co.uk> | 2015-02-17 10:57:31 +0000 |
| commit | ffd545fd5cd5e7abb6f9ebe1a968d52c2937913f (patch) | |
| tree | 912d8661613289db40a6488dd13e2b816508e920 /strata/lorry | |
| parent | 480255744e15a59f6a78b06ec5264b00159c9ea9 (diff) | |
| download | definitions-ffd545fd5cd5e7abb6f9ebe1a968d52c2937913f.tar.gz | |
strata/lorry: update to apr 1.5.1 and apr-util 1.5.4
This commit also changes these packages to be built from the git repos
created from the upstream svn ones, instead of tarball imports.
Diffstat (limited to 'strata/lorry')
| -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 |
2 files changed, 24 insertions, 1 deletions
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/ |