summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Gomes <tiago.gomes@codethink.co.uk>2015-02-13 16:14:48 +0000
committerEdward Cragg <edward.cragg@codethink.co.uk>2015-02-17 10:57:31 +0000
commitffd545fd5cd5e7abb6f9ebe1a968d52c2937913f (patch)
tree912d8661613289db40a6488dd13e2b816508e920
parent480255744e15a59f6a78b06ec5264b00159c9ea9 (diff)
downloaddefinitions-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.
-rw-r--r--strata/lorry.morph29
-rw-r--r--strata/lorry/libapr-util.morph (renamed from strata/lorry/libapr-util-tarball.morph)4
-rw-r--r--strata/lorry/libapr.morph21
3 files changed, 39 insertions, 15 deletions
diff --git a/strata/lorry.morph b/strata/lorry.morph
index 17f845cf..c66b8502 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
@@ -67,8 +68,8 @@ chunks:
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
@@ -88,8 +89,8 @@ chunks:
unpetrify-ref: baserock/morph
build-depends:
- swig-tarball
- - libapr-tarball
- - libapr-util-tarball
+ - libapr
+ - libapr-util
- libserf-tarball
- neon
- name: mercurial-tarball
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/