diff options
| author | Javier Jardón <jjardon@gnome.org> | 2015-02-18 23:21:30 +0000 |
|---|---|---|
| committer | Javier Jardón <jjardon@gnome.org> | 2015-02-18 23:54:40 +0000 |
| commit | 5005bc258e22afabde69037fa0d202b138d2c983 (patch) | |
| tree | a4034d5537bf4657dff182cd9fe56a53c1207d5e | |
| parent | 189b3301519fb29135c962b138b0a8cc96739553 (diff) | |
| download | definitions-5005bc258e22afabde69037fa0d202b138d2c983.tar.gz | |
coreutils, diff, sed: Remove workaround and depend on rsync instead
| -rw-r--r-- | strata/coreutils-common.morph | 5 | ||||
| -rw-r--r-- | strata/coreutils-common/coreutils.morph | 1 | ||||
| -rw-r--r-- | strata/coreutils-common/diff.morph | 1 | ||||
| -rw-r--r-- | strata/coreutils-common/sed.morph | 1 |
4 files changed, 4 insertions, 4 deletions
diff --git a/strata/coreutils-common.morph b/strata/coreutils-common.morph index 9f44515b..2651aa79 100644 --- a/strata/coreutils-common.morph +++ b/strata/coreutils-common.morph @@ -18,7 +18,8 @@ chunks: repo: upstream:coreutils ref: 9df9643842e4b4d8ece710fe6105f32fa38a0d22 unpetrify-ref: baserock/8.23 - build-depends: [] + build-depends: + - rsync - name: sed morph: strata/coreutils-common/sed.morph repo: upstream:sed @@ -26,6 +27,7 @@ chunks: unpetrify-ref: baserock/morph build-depends: - coreutils + - rsync - name: diff morph: strata/coreutils-common/diff.morph repo: upstream:diffutils @@ -33,3 +35,4 @@ chunks: unpetrify-ref: baserock/v3.3 build-depends: - coreutils + - rsync diff --git a/strata/coreutils-common/coreutils.morph b/strata/coreutils-common/coreutils.morph index cc1ae683..ad16c866 100644 --- a/strata/coreutils-common/coreutils.morph +++ b/strata/coreutils-common/coreutils.morph @@ -2,7 +2,6 @@ name: coreutils kind: chunk build-system: autotools configure-commands: -- sed -i -e '/^buildreq="/,/^"/{/rsync/d}' bootstrap.conf - bash bootstrap --skip-po - FORCE_UNSAFE_CONFIGURE=1 ./configure --prefix="$PREFIX" --disable-nls build-commands: diff --git a/strata/coreutils-common/diff.morph b/strata/coreutils-common/diff.morph index 3a05af2d..7d783d71 100644 --- a/strata/coreutils-common/diff.morph +++ b/strata/coreutils-common/diff.morph @@ -2,6 +2,5 @@ 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 92f6fa51..bcbd61de 100644 --- a/strata/coreutils-common/sed.morph +++ b/strata/coreutils-common/sed.morph @@ -2,7 +2,6 @@ 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: |