summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--strata/core.morph18
-rw-r--r--strata/core/cpython.morph6
2 files changed, 15 insertions, 9 deletions
diff --git a/strata/core.morph b/strata/core.morph
index a435c051..1fb541fb 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -133,6 +133,14 @@ chunks:
unpetrify-ref: baserock/genivi/baseline
build-depends:
- automake
+- name: libffi
+ morph: strata/core/libffi.morph
+ repo: upstream:libffi
+ ref: 77d4586cc47e8f4c02278afbc220145bba0d442b
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - autoconf
+ - automake
- name: cpython
morph: strata/core/cpython.morph
repo: upstream:cpython
@@ -141,6 +149,8 @@ chunks:
build-depends:
- openssl-new
- bzip2
+ - libexpat
+ - libffi
- sqlite3
- ncurses
- readline
@@ -381,14 +391,6 @@ chunks:
build-depends:
- autoconf
- automake
-- name: libffi
- morph: strata/core/libffi.morph
- repo: upstream:libffi
- ref: 77d4586cc47e8f4c02278afbc220145bba0d442b
- unpetrify-ref: baserock/morph
- build-depends:
- - autoconf
- - automake
- name: glib
repo: upstream:glib
ref: 966ffb16f6bd54cb3d928a55d00d0eda73592094
diff --git a/strata/core/cpython.morph b/strata/core/cpython.morph
index 6c9e4b3d..d0c80220 100644
--- a/strata/core/cpython.morph
+++ b/strata/core/cpython.morph
@@ -2,6 +2,10 @@ name: cpython
kind: chunk
build-system: autotools
configure-commands:
-- ./configure --prefix="$PREFIX" --enable-shared
+- |
+ ./configure --prefix="$PREFIX" \
+ --enable-shared \
+ --with-system-expat \
+ --with-system-ffi
post-install-commands:
- test -x "$DESTDIR"/"$PREFIX"/bin/python2 || ln -s python2.7 "$DESTDIR"/"$PREFIX"/bin/python2