diff options
Diffstat (limited to 'strata')
| -rw-r--r-- | strata/core.morph | 16 | ||||
| -rw-r--r-- | strata/core/python3.morph | 12 | ||||
| -rw-r--r-- | strata/docutils.morph | 2 | ||||
| -rw-r--r-- | strata/foundation.morph | 1 | ||||
| -rw-r--r-- | strata/glib-common.morph | 2 | ||||
| -rw-r--r-- | strata/llvm-common.morph | 2 | ||||
| -rw-r--r-- | strata/python-core.morph | 26 | ||||
| -rw-r--r-- | strata/python-core/cpython.morph (renamed from strata/core/cpython.morph) | 1 | ||||
| -rw-r--r-- | strata/python-pygobject.morph | 2 | ||||
| -rw-r--r-- | strata/python3-core.morph | 11 | ||||
| -rw-r--r-- | strata/python3-core/python3.morph | 7 |
11 files changed, 52 insertions, 30 deletions
diff --git a/strata/core.morph b/strata/core.morph index 5ef86c1b..89299f38 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -119,11 +119,11 @@ chunks: ref: 24adc227bc29cd17e39df097fbca389c7724cd14 unpetrify-ref: sqlite-autoconf-3080801 build-system: autotools -- name: cpython - morph: strata/core/cpython.morph +- name: python3 + morph: strata/core/python3.morph repo: upstream:cpython - ref: 57af3f22d11600ca98c0c9073d0b3b57d43f7c4b - unpetrify-ref: v2.7.10 + ref: 3f1e8a3de39ff8a807720d57f49a91d7449435ad + unpetrify-ref: v3.4.3 build-depends: - openssl-new - bzip2 @@ -139,7 +139,7 @@ chunks: unpetrify-ref: baserock/debian/20140325 build-depends: - automake - - cpython + - python3 - name: curl morph: strata/core/curl.morph repo: upstream:curl @@ -166,7 +166,7 @@ chunks: unpetrify-ref: v2.3.0 build-depends: - autoconf - - cpython + - python3 - curl - gettext-tarball - libexpat @@ -340,7 +340,7 @@ chunks: - autoconf - automake - file - - cpython + - python3 - libtool - xz - name: libxslt @@ -388,7 +388,7 @@ chunks: unpetrify-ref: 0.22 build-system: python-distutils build-depends: - - cpython + - python3 - name: gperf morph: strata/core/gperf.morph repo: upstream:gperf diff --git a/strata/core/python3.morph b/strata/core/python3.morph new file mode 100644 index 00000000..4b3ef290 --- /dev/null +++ b/strata/core/python3.morph @@ -0,0 +1,12 @@ +name: python3 +kind: chunk +build-system: autotools +configure-commands: +- | + ./configure --prefix="$PREFIX" \ + --enable-shared \ + --with-system-expat \ + --with-system-ffi +post-install-commands: +- test -x "$DESTDIR"/"$PREFIX"/bin/python || ln -s python3.4 "$DESTDIR"/"$PREFIX"/bin/python +- test -x "$DESTDIR"/"$PREFIX"/bin/python3 || ln -s python3.4 "$DESTDIR"/"$PREFIX"/bin/python3 diff --git a/strata/docutils.morph b/strata/docutils.morph index 4329bb42..214e4267 100644 --- a/strata/docutils.morph +++ b/strata/docutils.morph @@ -2,7 +2,7 @@ name: docutils kind: stratum description: Stuff for generating documentation build-depends: -- morph: strata/core.morph +- morph: strata/python-core.morph chunks: - name: xml-catalog morph: strata/docutils/xml-catalog.morph diff --git a/strata/foundation.morph b/strata/foundation.morph index ff18e4e7..55596454 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -3,6 +3,7 @@ kind: stratum description: Basic userland runtime system build-depends: - morph: strata/coreutils-common.morph +- morph: strata/python-core.morph chunks: - name: bash-completion repo: upstream:bash-completion diff --git a/strata/glib-common.morph b/strata/glib-common.morph index 09c88dfe..9f7b5e6e 100644 --- a/strata/glib-common.morph +++ b/strata/glib-common.morph @@ -2,7 +2,7 @@ name: glib-common kind: stratum description: GLib and dependencies build-depends: -- morph: strata/core.morph +- morph: strata/python-core.morph chunks: - name: gtk-doc-stub repo: upstream:gtk-doc-stub diff --git a/strata/llvm-common.morph b/strata/llvm-common.morph index 794a7fc5..ecf7302f 100644 --- a/strata/llvm-common.morph +++ b/strata/llvm-common.morph @@ -1,7 +1,7 @@ name: llvm-common kind: stratum build-depends: -- morph: strata/core.morph +- morph: strata/python-core.morph chunks: - name: llvm morph: strata/llvm-common/llvm.morph diff --git a/strata/python-core.morph b/strata/python-core.morph index 630a8073..43acacd0 100644 --- a/strata/python-core.morph +++ b/strata/python-core.morph @@ -4,17 +4,25 @@ description: Core python packages build-depends: - morph: strata/core.morph chunks: +- name: cpython + morph: strata/python-core/cpython.morph + repo: upstream:cpython + ref: 57af3f22d11600ca98c0c9073d0b3b57d43f7c4b + unpetrify-ref: v2.7.10 - name: python-setuptools morph: strata/core/python-setuptools.morph repo: upstream:python-setuptools-bitbucket ref: 0aa6a4de5931d02876428388678802db2371fd37 unpetrify-ref: baserock/master + build-depends: + - cpython - name: mako repo: upstream:python-packages/mako.git ref: 285bc818a50ccc0f9549630f7c4f4c250585c3e7 unpetrify-ref: rel_1_0_0 build-system: python-distutils build-depends: + - cpython - python-setuptools - name: pbr repo: upstream:pbr @@ -22,31 +30,49 @@ chunks: unpetrify-ref: 0.10.7 build-system: python-distutils build-depends: + - cpython - python-setuptools - name: python-requests repo: upstream:python-requests ref: b83131779c701720a9ae9efae78996277d416269 unpetrify-ref: v2.5.1 build-system: python-distutils + build-depends: + - cpython - name: six repo: upstream:six ref: 8cfbff6b764af86d825086fa1637aa009e90d75a unpetrify-ref: 1.9.0 build-system: python-distutils + build-depends: + - cpython - name: pyyaml morph: strata/python-core/pyyaml.morph repo: upstream:pyyaml ref: d9fbcceaed39d955f6871b07c61dc42f824285c1 unpetrify-ref: baserock/morph build-depends: + - cpython - python-setuptools +- name: cython2 + repo: upstream:cython + ref: 4dd8e762fa51d01775506fbbc102c45dbcea065d + unpetrify-ref: 0.22 + build-system: python-distutils + build-depends: + - cpython - name: python-lxml repo: upstream:python-lxml ref: 14505bc62f5f1fc9fb0ff007955f3e67ab4562bb unpetrify-ref: lxml-3.4.0 build-system: python-distutils + build-depends: + - cpython + - cython2 - name: python-markdown repo: upstream:python-markdown ref: f0c5b71acbc02af60a33d67c59558bb513b25e74 unpetrify-ref: 2.5.1-final build-system: python-distutils + build-depends: + - cpython diff --git a/strata/core/cpython.morph b/strata/python-core/cpython.morph index e2f59278..853b0630 100644 --- a/strata/core/cpython.morph +++ b/strata/python-core/cpython.morph @@ -9,4 +9,5 @@ configure-commands: --with-system-expat \ --with-system-ffi post-install-commands: +- ln -sf python2.7 "$DESTDIR"/"$PREFIX"/bin/python - test -x "$DESTDIR"/"$PREFIX"/bin/python2 || ln -s python2.7 "$DESTDIR"/"$PREFIX"/bin/python2 diff --git a/strata/python-pygobject.morph b/strata/python-pygobject.morph index 53e9fd72..e536ff18 100644 --- a/strata/python-pygobject.morph +++ b/strata/python-pygobject.morph @@ -3,7 +3,7 @@ kind: stratum description: | Python GObject bindings build-depends: -- morph: strata/core.morph +- morph: strata/python-core.morph - morph: strata/glib-common.morph chunks: - name: pygobject diff --git a/strata/python3-core.morph b/strata/python3-core.morph deleted file mode 100644 index f0da65fc..00000000 --- a/strata/python3-core.morph +++ /dev/null @@ -1,11 +0,0 @@ -name: python3-core -kind: stratum -description: Core python3 packages -build-depends: -- morph: strata/core.morph -chunks: -- name: python3 - morph: strata/python3-core/python3.morph - repo: upstream:cpython - ref: 3f1e8a3de39ff8a807720d57f49a91d7449435ad - unpetrify-ref: v3.4.3 diff --git a/strata/python3-core/python3.morph b/strata/python3-core/python3.morph deleted file mode 100644 index f02452d4..00000000 --- a/strata/python3-core/python3.morph +++ /dev/null @@ -1,7 +0,0 @@ -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 |