summaryrefslogtreecommitdiff
path: root/strata/lorry
diff options
context:
space:
mode:
Diffstat (limited to 'strata/lorry')
-rw-r--r--strata/lorry/cvs-tarball.morph3
-rw-r--r--strata/lorry/libapr-util.morph (renamed from strata/lorry/libapr-util-tarball.morph)4
-rw-r--r--strata/lorry/libapr.morph21
-rw-r--r--strata/lorry/libserf.morph6
-rw-r--r--strata/lorry/subversion-tarball.morph2
-rw-r--r--strata/lorry/swig-tarball.morph2
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