summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2015-06-02 17:43:57 +0100
committerBaserock Gerrit <gerrit@baserock.org>2015-06-07 23:33:37 +0000
commit313b5376612e381b7ce4ec341cea48bf2f1d33da (patch)
tree5d30820b2069c681e5220b9b1d4b3647a2921ad4
parent67bcbf986a19ada7574224d1b6cc3ec7039398b8 (diff)
downloaddefinitions-313b5376612e381b7ce4ec341cea48bf2f1d33da.tar.gz
Make sed and diff not depend on git
Change-Id: If8cd1c3632488ac28bb3f65af004d4f6d12a1999
-rw-r--r--strata/coreutils-common/diff.morph5
-rw-r--r--strata/coreutils-common/sed.morph5
2 files changed, 6 insertions, 4 deletions
diff --git a/strata/coreutils-common/diff.morph b/strata/coreutils-common/diff.morph
index 346f8635..c5eb809d 100644
--- a/strata/coreutils-common/diff.morph
+++ b/strata/coreutils-common/diff.morph
@@ -1,7 +1,8 @@
name: diff
kind: chunk
build-system: autotools
-configure-commands:
+pre-configure-commands:
- sed -i -e '/^buildreq="/,/^"/{/rsync/d}' bootstrap.conf
-- ./bootstrap --skip-po
+- ./bootstrap --skip-po --no-git --gnulib-srcdir=gnulib
+configure-commands:
- ./configure --prefix="$PREFIX" --disable-gcc-warnings
diff --git a/strata/coreutils-common/sed.morph b/strata/coreutils-common/sed.morph
index 92f6fa51..75b969de 100644
--- a/strata/coreutils-common/sed.morph
+++ b/strata/coreutils-common/sed.morph
@@ -1,9 +1,10 @@
name: sed
kind: chunk
build-system: autotools
-configure-commands:
+pre-configure-commands:
- sed -i -e '/^buildreq="/,/^"/{/rsync/d}' bootstrap.conf
-- ./bootstrap --skip-po
+- ./bootstrap --skip-po --no-git --gnulib-srcdir=gnulib
+configure-commands:
- ./configure --prefix="$PREFIX" --disable-gcc-warnings
post-install-commands:
# This hack is to use GNU sed instead the busybox one.