diff options
| author | Luca Bruno <lethalman88@gmail.com> | 2015-04-17 13:01:09 +0200 |
|---|---|---|
| committer | Luca Bruno <lethalman88@gmail.com> | 2015-04-17 13:01:09 +0200 |
| commit | 9d3f02c5de8617556d4ca982c0fdf41d86b5950d (patch) | |
| tree | 8f290e2497e14097c5fe351323fe1c7307e581bf /pkgs/applications/editors | |
| parent | 7bf532fb030d018a85ca6c039fc7e153d0167994 (diff) | |
| download | nixpkgs-9d3f02c5de8617556d4ca982c0fdf41d86b5950d.tar nixpkgs-9d3f02c5de8617556d4ca982c0fdf41d86b5950d.tar.gz nixpkgs-9d3f02c5de8617556d4ca982c0fdf41d86b5950d.tar.bz2 nixpkgs-9d3f02c5de8617556d4ca982c0fdf41d86b5950d.tar.lz nixpkgs-9d3f02c5de8617556d4ca982c0fdf41d86b5950d.tar.xz nixpkgs-9d3f02c5de8617556d4ca982c0fdf41d86b5950d.tar.zst nixpkgs-9d3f02c5de8617556d4ca982c0fdf41d86b5950d.zip | |
Revert "Emacs 24.5: Fix build on Darwin."
This reverts commit 869b86d925a9e2e592e0a6385908faa186eace77. It breaks tarball evaluation, see https://github.com/NixOS/nixpkgs/commit/869b86d925a9e2e592e0a6385908faa186eace77
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/emacs-24/darwin-new-sections.patch | 50 | ||||
| -rw-r--r-- | pkgs/applications/editors/emacs-24/default.nix | 1 |
2 files changed, 51 insertions, 0 deletions
diff --git a/pkgs/applications/editors/emacs-24/darwin-new-sections.patch b/pkgs/applications/editors/emacs-24/darwin-new-sections.patch new file mode 100644 index 00000000000..dfd72fe3f51 --- /dev/null +++ b/pkgs/applications/editors/emacs-24/darwin-new-sections.patch @@ -0,0 +1,50 @@ +http://bazaar.launchpad.net/~naesten/emacs/nextstep-stuff/revision/108961 + +diff -ru emacs-24.3-orig/src/unexmacosx.c emacs-24.3/src/unexmacosx.c +--- emacs-24.3-orig/src/unexmacosx.c 2013-01-01 21:37:17.000000000 +0100 ++++ emacs-24.3/src/unexmacosx.c 2014-08-09 18:39:52.000000000 +0200 +@@ -838,7 +838,7 @@ + if (!(sectp->addr <= (unsigned long)my_edata + && my_size <= sectp->size)) + unexec_error ("my_edata is not in section %s", SECT_DATA); +- if (!unexec_write (sectp->offset, (void *) sectp->addr, my_size)) ++ if (!unexec_write (sectp->offset, (void *) sectp->addr, sectp->size)) + unexec_error ("cannot write section %s", SECT_DATA); + if (!unexec_copy (sectp->offset + my_size, old_file_offset + my_size, + sectp->size - my_size)) +@@ -880,6 +880,27 @@ + if (!unexec_write (header_offset, sectp, sizeof (struct section))) + unexec_error ("cannot write section %.16s's header", sectp->sectname); + } ++ else if (strncmp (sectp->sectname, "__bss", 5) == 0 ++ || strncmp (sectp->sectname, "__pu_bss", 8) == 0) ++ { ++ sectp->flags = S_REGULAR; ++ ++ /* These sections are produced by GCC 4.6+. ++ ++ FIXME: We possibly ought to clear uninitialized local ++ variables in statically linked libraries like for ++ SECT_BSS (__bss) above, but setting up the markers we ++ need in lastfile.c would be rather messy. See ++ darwin_output_aligned_bss () in gcc/config/darwin.c for ++ the root of the problem, keeping in mind that the ++ sections are numbered by their alignment in GCC 4.6, but ++ by log2(alignment) in GCC 4.7. */ ++ ++ if (!unexec_write (sectp->offset, (void *) sectp->addr, sectp->size)) ++ unexec_error ("cannot copy section %.16s", sectp->sectname); ++ if (!unexec_write (header_offset, sectp, sizeof (struct section))) ++ unexec_error ("cannot write section %.16s's header", sectp->sectname); ++ } + else if (strncmp (sectp->sectname, "__la_symbol_ptr", 16) == 0 + || strncmp (sectp->sectname, "__nl_symbol_ptr", 16) == 0 + || strncmp (sectp->sectname, "__got", 16) == 0 +@@ -891,6 +912,7 @@ + || strncmp (sectp->sectname, "__program_vars", 16) == 0 + || strncmp (sectp->sectname, "__mod_init_func", 16) == 0 + || strncmp (sectp->sectname, "__mod_term_func", 16) == 0 ++ || strncmp (sectp->sectname, "__static_data", 16) == 0 + || strncmp (sectp->sectname, "__objc_", 7) == 0) + { + if (!unexec_copy (sectp->offset, old_file_offset, sectp->size)) diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index 01895647a6b..c6060d2720b 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { }; patches = stdenv.lib.optionals stdenv.isDarwin [ + ./darwin-new-sections.patch ./at-fdcwd.patch ]; |