summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Sherwood <paul.sherwood@codethink.co.uk>2014-12-14 19:55:17 +0000
committerPaul Sherwood <paul.sherwood@codethink.co.uk>2014-12-15 07:08:00 +0000
commit180dce4bd4a03529bdcf705a7147d1f03192112a (patch)
treee51b3ccb2a792cb9a88c4517d3d2702e9a927ae0
parent68fe84679215c0a08b4a38fed73f811270972ea4 (diff)
downloaddefinitions-baserock/ps/add-python3.tar.gz
Add python3 to corebaserock/ps/add-python3
-rw-r--r--strata/core.morph23
-rw-r--r--strata/core/python2.morph (renamed from strata/core/cpython.morph)2
-rw-r--r--strata/core/python3.morph7
3 files changed, 25 insertions, 7 deletions
diff --git a/strata/core.morph b/strata/core.morph
index a1fc9a10..50d9b67c 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -114,8 +114,8 @@ chunks:
ref: 518937ab89be812ccd45e9b8c1ce4ad721d35ef6
unpetrify-ref: baserock/genivi/baseline
build-depends: []
-- name: cpython
- morph: strata/core/cpython.morph
+- name: python2
+ morph: strata/core/python2.morph
repo: upstream:cpython
ref: 0b92c75574adef1e1ccf1b635a3724a86b567cd2
unpetrify-ref: v2.7.8
@@ -125,6 +125,17 @@ chunks:
- sqlite3
- ncurses
- readline
+- name: python3
+ morph: strata/core/python3.morph
+ repo: upstream:cpython
+ ref: d1414cefaddc7b56caef75eea87226b1fce5ca7c
+ unpetrify-ref: v3.4.2
+ build-depends:
+ - openssl-new
+ - bzip2
+ - sqlite3
+ - ncurses
+ - readline
- name: libtool
morph: strata/core/libtool.morph
repo: upstream:libtool
@@ -157,7 +168,7 @@ chunks:
build-depends:
- autoconf
- automake
- - cpython
+ - python2
- libtool
- xz
- name: ca-certificates
@@ -167,7 +178,7 @@ chunks:
unpetrify-ref: baserock/debian/20140325
build-depends:
- automake
- - cpython
+ - python2
- name: curl
morph: strata/core/curl.morph
repo: upstream:curl
@@ -203,7 +214,7 @@ chunks:
unpetrify-ref: v2.1.3
build-depends:
- autoconf
- - cpython
+ - python2
- curl
- gettext
- libexpat
@@ -276,7 +287,7 @@ chunks:
ref: 0aa6a4de5931d02876428388678802db2371fd37
unpetrify-ref: baserock/master
build-depends:
- - cpython
+ - python2
- name: pyyaml
morph: strata/core/pyyaml.morph
repo: upstream:pyyaml
diff --git a/strata/core/cpython.morph b/strata/core/python2.morph
index 6c9e4b3d..997fe6fb 100644
--- a/strata/core/cpython.morph
+++ b/strata/core/python2.morph
@@ -1,4 +1,4 @@
-name: cpython
+name: python2
kind: chunk
build-system: autotools
configure-commands:
diff --git a/strata/core/python3.morph b/strata/core/python3.morph
new file mode 100644
index 00000000..f02452d4
--- /dev/null
+++ b/strata/core/python3.morph
@@ -0,0 +1,7 @@
+name: python3
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./configure --prefix="$PREFIX" --enable-shared
+post-install-commands:
+- test -x "$DESTDIR"/"$PREFIX"/bin/python3 || ln -s python3.4 "$DESTDIR"/"$PREFIX"/bin/python3