summary refs log tree commit diff
path: root/gnu/packages/patches
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2014-10-08 03:49:43 -0400
committerMark H Weaver <mhw@netris.org>2014-10-21 00:07:31 -0400
commit388fd01b0230259a12b23c52f6d6a6baa7b35c92 (patch)
tree0e79b6aeb738c09bbc37e5332fda5ff9bcc9a78f /gnu/packages/patches
parent05b4226ad9fb37e71d49653292ad4afdcfdd160d (diff)
downloadguix-388fd01b0230259a12b23c52f6d6a6baa7b35c92.tar.gz
gnu: emacs: Update to 24.4.
* gnu/packages/patches/emacs-configure-sh.patch: Remove.
* gnu-system.am (dist_patch_DATA): Remove it.
* gnu/packages/emacs.scm (emacs): Update to 24.4.  Add 'acl' as input.
  Remove --with-crt-dir configure option.
  (emacs-no-x-toolkit): Add 'inotify-tools' as input.  Adjust to cope
  with the lack of configure-flags in the main 'emacs' package.
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r--gnu/packages/patches/emacs-configure-sh.patch13
1 files changed, 0 insertions, 13 deletions
diff --git a/gnu/packages/patches/emacs-configure-sh.patch b/gnu/packages/patches/emacs-configure-sh.patch
deleted file mode 100644
index 6f5f3fe93a..0000000000
--- a/gnu/packages/patches/emacs-configure-sh.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Make sure the right shell is used when creating src/epaths.h.
-
---- emacs-24.3/configure	2013-03-14 17:42:26.000000000 +0100
-+++ emacs-24.3/configure	2013-03-14 17:42:58.000000000 +0100
-@@ -26463,7 +26463,7 @@ done
-  ;;
-     "epaths":C)
- echo creating src/epaths.h
--${MAKE-make} MAKEFILE_NAME=do-not-make-Makefile epaths-force
-+${MAKE-make} MAKEFILE_NAME=do-not-make-Makefile epaths-force SHELL="$CONFIG_SHELL"
-  ;;
-     "gdbinit":C)
- if test ! -f src/.gdbinit && test -f $srcdir/src/.gdbinit; then