diff options
| author | Eric Bavier <bavier@member.fsf.org> | 2014-04-07 11:15:48 -0500 |
|---|---|---|
| committer | Eric Bavier <bavier@member.fsf.org> | 2014-04-07 20:41:25 -0500 |
| commit | 8a9d928f57bd37bc2ff2742bee280962ffb9bc21 (patch) | |
| tree | 5f5b4e0e33beedb6d3903f4a6c77a9cf10a50afa /gnu/packages/patches | |
| parent | ce0849cc25e7d0813f1fec82cd97fe3aadf9932b (diff) | |
| download | guix-8a9d928f57bd37bc2ff2742bee280962ffb9bc21.tar guix-8a9d928f57bd37bc2ff2742bee280962ffb9bc21.tar.gz | |
gnu: Add patchutils and quilt
* gnu/packages/patchutils.scm: New file
* gnu/packages/patches/patchutils-xfail-gendiff-tests.patch: New patch
* gnu-system.am (GNU_SYSTEM_MODULES): Add patchutils.
(dist_patch_DATA): Add patch.
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/patchutils-xfail-gendiff-tests.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/gnu/packages/patches/patchutils-xfail-gendiff-tests.patch b/gnu/packages/patches/patchutils-xfail-gendiff-tests.patch new file mode 100644 index 0000000000..b2e77d22f2 --- /dev/null +++ b/gnu/packages/patches/patchutils-xfail-gendiff-tests.patch @@ -0,0 +1,26 @@ +The gendiff1 and gendiff2 tests need the gendiff script that's distributed +with the rpm package management tool. Without that script, these tests are +expected to fail. + +Need to mark one of the tests as PHONY to get permissions set correctly on +built scripts. + +--- a/Makefile.in 2011-02-10 09:44:43.000000000 -0600 ++++ b/Makefile.in 2014-03-06 17:27:55.610048953 -0600 +@@ -378,6 +378,8 @@ + # These ones don't work yet. + # Feel free to send me patches. :-) + XFAIL_TESTS = \ ++ tests/gendiff1/run-test \ ++ tests/gendiff2/run-test \ + tests/delhunk5/run-test \ + tests/delhunk6/run-test + +@@ -1106,6 +1108,7 @@ + rm -f $(DESTDIR)$(bindir)/"`echo lsdiff|sed '$(transform)'`" + rm -f $(DESTDIR)$(bindir)/"`echo grepdiff|sed '$(transform)'`" + ++.PHONY: tests/combine1/run-test + tests/combine1/run-test: src/combinediff$(EXEEXT) src/flipdiff$(EXEEXT) \ + src/lsdiff$(EXEEXT) src/grepdiff$(EXEEXT) + for script in $(bin_SCRIPTS); do \ |