summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2016-07-22 17:25:26 (GMT)
committerJavier Jardón <jjardon@gnome.org>2016-11-10 21:30:10 (GMT)
commitcc5f4be3a9964d2ed0c2417bc7c4c1c100aac7d4 (patch)
tree0bd08bc117e90be7981e1d5207f1b38b29d8b4ba
parent491a411b554669a8d6b9313e66368164631a009f (diff)
downloaddefinitions-jjardon/bootstrap-commands.tar.gz
Change-Id: I9f63079bd349023670a8afb807a3df5b1c6247b6
-rw-r--r--strata/core/attr.morph2
-rw-r--r--strata/core/autoconf.morph2
-rw-r--r--strata/core/flex.morph4
-rw-r--r--strata/core/git-minimal.morph2
-rw-r--r--strata/core/libexpat.morph2
-rw-r--r--strata/core/linux-pam.morph2
-rw-r--r--strata/core/readline.morph3
-rw-r--r--strata/coreutils-common/coreutils.morph2
8 files changed, 6 insertions, 13 deletions
diff --git a/strata/core/attr.morph b/strata/core/attr.morph
index d0bf697..6b9afcb 100644
--- a/strata/core/attr.morph
+++ b/strata/core/attr.morph
@@ -1,7 +1,7 @@
name: attr
kind: chunk
build-system: autotools
-pre-configure-commands:
+bootstrap-commands:
- make configure
configure-commands:
- |
diff --git a/strata/core/autoconf.morph b/strata/core/autoconf.morph
index 63b95ba..683a9b4 100644
--- a/strata/core/autoconf.morph
+++ b/strata/core/autoconf.morph
@@ -1,5 +1,5 @@
name: autoconf
kind: chunk
build-system: autotools
-pre-configure-commands:
+pre-bootstrap-commands:
- echo "2.69" > .tarball-version
diff --git a/strata/core/flex.morph b/strata/core/flex.morph
index 615bf79..2794c9b 100644
--- a/strata/core/flex.morph
+++ b/strata/core/flex.morph
@@ -1,9 +1,7 @@
name: flex
kind: chunk
-pre-configure-commands:
+bootstrap-commands:
- autoreconf -ivf
-configure-commands:
-- ./configure --prefix="$PREFIX"
build-commands:
- make dist_doc_DATA=
install-commands:
diff --git a/strata/core/git-minimal.morph b/strata/core/git-minimal.morph
index 8b562ef..2ad6fad 100644
--- a/strata/core/git-minimal.morph
+++ b/strata/core/git-minimal.morph
@@ -1,7 +1,7 @@
name: git-minimal
kind: chunk
build-system: autotools
-pre-configure-commands:
+bootstrap-commands:
- make configure
build-commands:
- make all
diff --git a/strata/core/libexpat.morph b/strata/core/libexpat.morph
index 05285c0..b565d2e 100644
--- a/strata/core/libexpat.morph
+++ b/strata/core/libexpat.morph
@@ -1,6 +1,6 @@
name: libexpat
kind: chunk
build-system: autotools
-pre-configure-commands:
+pre-bootstrap-commands:
- ./buildconf.sh
- automake --add-missing --copy || true
diff --git a/strata/core/linux-pam.morph b/strata/core/linux-pam.morph
index e65caa6..667bbed 100644
--- a/strata/core/linux-pam.morph
+++ b/strata/core/linux-pam.morph
@@ -1,8 +1,6 @@
name: linux-pam
kind: chunk
build-system: autotools
-pre-configure-commands:
-- autoreconf -ivf
configure-commands:
# libdir has to be specified or it'll go into lib64. It has to be /usr/lib because
# systemd installs its pam library into /usr/lib/security.
diff --git a/strata/core/readline.morph b/strata/core/readline.morph
index 08c9586..3fed7ba 100644
--- a/strata/core/readline.morph
+++ b/strata/core/readline.morph
@@ -1,8 +1,5 @@
name: readline
kind: chunk
build-system: autotools
-pre-configure-commands:
-- cp /usr/share/automake*/config.guess support
-- cp /usr/share/automake*/config.sub support
build-commands:
- make SHLIB_LIBS=-lncurses
diff --git a/strata/coreutils-common/coreutils.morph b/strata/coreutils-common/coreutils.morph
index 3071cb9..fdeb9dc 100644
--- a/strata/coreutils-common/coreutils.morph
+++ b/strata/coreutils-common/coreutils.morph
@@ -1,7 +1,7 @@
name: coreutils
kind: chunk
build-system: autotools
-pre-configure-commands:
+bootstrap-commands:
- sed -i -e '/^buildreq="/,/^"/{/rsync/d}' bootstrap.conf
- bash bootstrap --skip-po --no-git --gnulib-srcdir=gnulib
configure-commands: