summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2015-02-18 21:41:31 +0000
committerJavier Jardón <jjardon@gnome.org>2015-02-18 21:41:31 +0000
commitd2b4ebbbc86bf2ee34ec47aab69839c1a32bb089 (patch)
tree11454967c39e9c3cde2ef51baeac3d6cf8ab78c5
parent35e72ecf8935d92b73af2438f9ac2f8c83e52fc5 (diff)
parent5d845d70d60ba2d0b62bbae9030615a9e2beedf9 (diff)
downloaddefinitions-d2b4ebbbc86bf2ee34ec47aab69839c1a32bb089.tar.gz
Merge branch 'baserock/jjardon/sed_fixes'
This fixes the broken build starting in commit 35e72ecf8935d92b73af2438f9ac2f8c83e52fc5
-rw-r--r--strata/coreutils-common/diff.morph1
-rw-r--r--strata/coreutils-common/sed.morph3
2 files changed, 3 insertions, 1 deletions
diff --git a/strata/coreutils-common/diff.morph b/strata/coreutils-common/diff.morph
index 7d783d71..3a05af2d 100644
--- a/strata/coreutils-common/diff.morph
+++ b/strata/coreutils-common/diff.morph
@@ -2,5 +2,6 @@ name: diff
kind: chunk
build-system: autotools
configure-commands:
+- sed -i -e '/^buildreq="/,/^"/{/rsync/d}' bootstrap.conf
- ./bootstrap --skip-po
- ./configure --prefix="$PREFIX"
diff --git a/strata/coreutils-common/sed.morph b/strata/coreutils-common/sed.morph
index e426afe7..92f6fa51 100644
--- a/strata/coreutils-common/sed.morph
+++ b/strata/coreutils-common/sed.morph
@@ -1,7 +1,8 @@
-me: sed
+name: sed
kind: chunk
build-system: autotools
configure-commands:
+- sed -i -e '/^buildreq="/,/^"/{/rsync/d}' bootstrap.conf
- ./bootstrap --skip-po
- ./configure --prefix="$PREFIX" --disable-gcc-warnings
post-install-commands: