From da1badcc76be85d324f8b9c1c34fbe2274a49ac1 Mon Sep 17 00:00:00 2001
From: Richard Ipsum <richard.ipsum@codethink.co.uk>
Date: Sun, 18 Oct 2015 11:19:50 +0000
Subject: RFC: Build git with man pages

This commit renames git in core to git-minimal and adds a git chunk into
devtools, the git chunk will replace git-minimal and will build and
install git's man pages.

It seems difficult to modify git in core so that it builds with docs
without creating circular dependencies, chunks such as libtool depend
on git, libxml2 depends on libtool, so libxml2 depends on git, but
docutils depends on libxml2, and we need to make git depend on docutils,
the fact that python2 is no longer in core also adds to the difficulty
since asciidoc's build process depends on python2.

Change-Id: Ifc64019b941740c85db058d36183b4a210c60e15
---
 strata/core.morph             | 12 ++++++------
 strata/core/git-minimal.morph |  7 +++++++
 strata/core/git.morph         |  7 -------
 strata/devtools.morph         |  6 ++++++
 strata/devtools/git.morph     |  9 +++++++++
 5 files changed, 28 insertions(+), 13 deletions(-)
 create mode 100644 strata/core/git-minimal.morph
 delete mode 100644 strata/core/git.morph
 create mode 100644 strata/devtools/git.morph

diff --git a/strata/core.morph b/strata/core.morph
index 4d51b763..23b24e8d 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -159,8 +159,8 @@ chunks:
   unpetrify-ref: gettext-0.19.4
   build-depends:
   - libexpat
-- name: git
-  morph: strata/core/git.morph
+- name: git-minimal
+  morph: strata/core/git-minimal.morph
   repo: upstream:git
   ref: 9874fca7122563e28d699a911404fc49d2a24f1c
   unpetrify-ref: v2.3.0
@@ -195,7 +195,7 @@ chunks:
   - automake
   - flex
   - gettext-tarball
-  - git
+  - git-minimal
   - help2man
   - mini-utils
 - name: patch
@@ -207,7 +207,7 @@ chunks:
   - autoconf
   - automake
   - bison
-  - git
+  - git-minimal
   - mini-utils
 - name: xz
   repo: upstream:xz
@@ -230,7 +230,7 @@ chunks:
   - automake
   - file
   - help2man
-  - git
+  - git-minimal
   - patch
   - texinfo-tarball
   - xz
@@ -317,7 +317,7 @@ chunks:
   - autoconf
   - automake
   - gettext-tarball
-  - git
+  - git-minimal
   - libtool
   - pkg-config
   - linux-pam
diff --git a/strata/core/git-minimal.morph b/strata/core/git-minimal.morph
new file mode 100644
index 00000000..8b562ef6
--- /dev/null
+++ b/strata/core/git-minimal.morph
@@ -0,0 +1,7 @@
+name: git-minimal
+kind: chunk
+build-system: autotools
+pre-configure-commands:
+- make configure
+build-commands:
+- make all
diff --git a/strata/core/git.morph b/strata/core/git.morph
deleted file mode 100644
index 765f4a5c..00000000
--- a/strata/core/git.morph
+++ /dev/null
@@ -1,7 +0,0 @@
-name: git
-kind: chunk
-build-system: autotools
-pre-configure-commands:
-- make configure
-build-commands:
-- make all
diff --git a/strata/devtools.morph b/strata/devtools.morph
index c48d63ab..5b714397 100644
--- a/strata/devtools.morph
+++ b/strata/devtools.morph
@@ -8,6 +8,7 @@ description: |
 build-depends:
 - morph: strata/core.morph
 - morph: strata/python2-core.morph
+- morph: strata/docutils.morph
 chunks:
 - name: nano
   morph: strata/devtools/nano.morph
@@ -44,3 +45,8 @@ chunks:
   repo: upstream:wget
   ref: 71d79f4f3043cf4ca3b2fb7f5328eae725c1293f
   unpetrify-ref: baserock/v1.16.3
+- name: git
+  morph: strata/devtools/git.morph
+  repo: upstream:git
+  ref: 9874fca7122563e28d699a911404fc49d2a24f1c
+  unpetrify-ref: v2.3.0
diff --git a/strata/devtools/git.morph b/strata/devtools/git.morph
new file mode 100644
index 00000000..6ca079a5
--- /dev/null
+++ b/strata/devtools/git.morph
@@ -0,0 +1,9 @@
+name: git
+kind: chunk
+build-system: autotools
+pre-configure-commands:
+- make configure
+build-commands:
+- make all doc
+install-commands:
+- make install install-doc
-- 
cgit v1.2.1