summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2015-02-10 17:16:05 (GMT)
committerSam Thursfield <sam.thursfield@codethink.co.uk>2015-02-10 17:16:05 (GMT)
commit5a5e418103a1784bdbeb82e2048a0712db0e9139 (patch)
treeeca05fe2c61079cda7801e38472b470cda61464c
parent0feca72982a5c67c2f43a2bf61e985e44ac550ea (diff)
parent88ea0d4652ceffd9972016b19a38a21625389f7b (diff)
downloaddefinitions-5a5e418103a1784bdbeb82e2048a0712db0e9139.tar.gz
Merge remote-tracking branch 'origin/sam/timezone-data'
Reviewed-By: Pedro Alvarez <pedro.alvarez@codethink.co.uk> Reviewed-By: Javier Jardón <javier.jardon@codethink.co.uk>
-rw-r--r--strata/foundation.morph6
-rw-r--r--strata/foundation/time-zone-database.morph10
2 files changed, 16 insertions, 0 deletions
diff --git a/strata/foundation.morph b/strata/foundation.morph
index 9738938..2445c00 100644
--- a/strata/foundation.morph
+++ b/strata/foundation.morph
@@ -22,6 +22,12 @@ chunks:
ref: ae58de0fcb4a6528dd365e23d383bbe2eaf2d566
unpetrify-ref: v18
build-depends: []
+- name: time-zone-database
+ morph: strata/foundation/time-zone-database.morph
+ repo: upstream:tz
+ ref: a0782484f101ac55c916568bc1c490d7761fc904
+ unpetrify-ref: 2015a
+ build-depends: []
- name: libcap2
morph: strata/foundation/libcap2.morph
repo: upstream:libcap2
diff --git a/strata/foundation/time-zone-database.morph b/strata/foundation/time-zone-database.morph
new file mode 100644
index 0000000..c3c89bc
--- /dev/null
+++ b/strata/foundation/time-zone-database.morph
@@ -0,0 +1,10 @@
+name: time-zone-database
+kind: chunk
+description: |
+ Time zone database.
+build-system: manual
+install-commands:
+# ETCDIR is actually where the 'tzselect', 'zdump' and 'zic' commands get
+# installed. Note that tzselect from this chunk will overlap with and override
+# the tzselect binary from GLIBC.
+- make TOPDIR="$PREFIX" ETCDIR="$PREFIX/bin" TZDIR="$PREFIX/share/zoneinfo" DESTDIR="$DESTDIR" install