summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2015-02-11 13:15:06 (GMT)
committerJavier Jardón <jjardon@gnome.org>2015-02-18 21:06:17 (GMT)
commit8d2e6b6c7a764284e7dacc15698452d6e19be977 (patch)
tree3455c30b0b25d2e2b2aef4018470cbb4fe2ccacb
parentbab3b7a33e664f8d0eb1d2424e480cdb3b7675c5 (diff)
downloaddefinitions-8d2e6b6c7a764284e7dacc15698452d6e19be977.tar.gz
Use GNU 'diff' instead the one from busyboxbaserock/jjardon/sed_diff
The busybox version caused problems with some packages
-rw-r--r--strata/coreutils-common.morph7
-rw-r--r--strata/coreutils-common/diff.morph6
2 files changed, 13 insertions, 0 deletions
diff --git a/strata/coreutils-common.morph b/strata/coreutils-common.morph
index 427199a..2051cf5 100644
--- a/strata/coreutils-common.morph
+++ b/strata/coreutils-common.morph
@@ -20,3 +20,10 @@ chunks:
unpetrify-ref: baserock/morph
build-depends:
- coreutils
+- name: diff
+ morph: strata/coreutils-common/diff.morph
+ repo: upstream:diffutils
+ ref: bd86eb1a1e87ab85a7c8dbb658fa829ce69c252e
+ unpetrify-ref: baserock/v3.3
+ build-depends:
+ - coreutils
diff --git a/strata/coreutils-common/diff.morph b/strata/coreutils-common/diff.morph
new file mode 100644
index 0000000..7d783d7
--- /dev/null
+++ b/strata/coreutils-common/diff.morph
@@ -0,0 +1,6 @@
+name: diff
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./bootstrap --skip-po
+- ./configure --prefix="$PREFIX"