summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2014-04-09 14:10:46 (GMT)
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2014-04-09 14:10:46 (GMT)
commit2ca076bc4caaf2b5c52840cd32fe0aba98d41091 (patch)
tree9132c6ab6897f6a68ac8b8223e4119e83a7a762d
parent6774167584dc652ae0fa03c99ac646101c23b8a3 (diff)
downloaddefinitions-liw/sqlite3-python-fix.tar.gz
Make cpython build-depend on sqlite3liw/sqlite3-python-fix
Also move sqlite3 from foundation to core, so we don't have foundation and core build-depending on each other. After this, "import sqlite3" works in Python.
-rw-r--r--core.morph6
-rw-r--r--foundation.morph5
2 files changed, 6 insertions, 5 deletions
diff --git a/core.morph b/core.morph
index 7b90657..67d3cca 100644
--- a/core.morph
+++ b/core.morph
@@ -5,6 +5,11 @@ description: Core components of a Baserock base system that are build tools requ
build-depends:
- morph: build-essential
chunks:
+- name: sqlite3
+ repo: upstream:sqlite3
+ ref: f6c2a9fe49d20654c2c41844d056033692a223b7
+ unpetrify-ref: baserock/morph
+ build-depends: []
- name: cmake
repo: upstream:cmake
ref: 7f9a761e761046a479fda38ee13f5dacd94ceeea
@@ -102,6 +107,7 @@ chunks:
build-depends:
- openssl-new
- bzip2
+ - sqlite3
- name: libtool
repo: upstream:libtool
ref: d388b7f2dc628b22006025d01179bc09b8aabe81
diff --git a/foundation.morph b/foundation.morph
index 413ed4b..827459e 100644
--- a/foundation.morph
+++ b/foundation.morph
@@ -30,11 +30,6 @@ chunks:
ref: 77d4586cc47e8f4c02278afbc220145bba0d442b
unpetrify-ref: baserock/morph
build-depends: []
-- name: sqlite3
- repo: upstream:sqlite3
- ref: f6c2a9fe49d20654c2c41844d056033692a223b7
- unpetrify-ref: baserock/morph
- build-depends: []
- name: libusbx
repo: upstream:libusbx
ref: 7ec94a45ed8155e7a1d4d5d75575099b09c78834