diff options
| author | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2015-02-04 10:08:53 +0000 |
|---|---|---|
| committer | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2015-02-11 10:33:03 +0000 |
| commit | f14549f8e43e0a94996c92cb93b675cdaeecd9f3 (patch) | |
| tree | 4e7f7e875fbd3d59565e89d797cc263adf1ea6d8 | |
| parent | 0a0beb059501a4bf4a366c32e68e7c807c2846d1 (diff) | |
| download | definitions-f14549f8e43e0a94996c92cb93b675cdaeecd9f3.tar.gz | |
Update to libexpat 2.0.1
Also change the build system to cmake, as the autotools based one
doesn't seem to work with the current automake version.
| -rw-r--r-- | strata/core.morph | 8 | ||||
| -rw-r--r-- | strata/core/libexpat.morph | 7 |
2 files changed, 6 insertions, 9 deletions
diff --git a/strata/core.morph b/strata/core.morph index c05fa5eb..b8f33731 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -168,12 +168,10 @@ chunks: - name: libexpat morph: strata/core/libexpat.morph repo: upstream:libexpat - ref: 97678ab13f6d29878997256b6ae1ded679ae5c5c - unpetrify-ref: baserock/morph + ref: 7cfc09db3e258129ab05811f2f9e351746ddab9f + unpetrify-ref: R_2_1_0 build-depends: - - autoconf-tarball - - automake - - libtool-tarball + - cmake - name: XML-Parser repo: upstream:XML-Parser ref: e1a3ec157140a699e3020836475a0df622f70f1b diff --git a/strata/core/libexpat.morph b/strata/core/libexpat.morph index 1e0fe696..b36a67aa 100644 --- a/strata/core/libexpat.morph +++ b/strata/core/libexpat.morph @@ -1,9 +1,8 @@ name: libexpat kind: chunk configure-commands: -- autoreconf -i -- ./configure --prefix="${PREFIX-/usr}" +- mkdir o && cd o && cmake -DCMAKE_INSTALL_PREFIX=/usr .. build-commands: -- make +- cd o && make install-commands: -- make DESTDIR="$DESTDIR" install +- cd o && make DESTDIR="$DESTDIR" install |