diff options
| author | jmmv <jmmv@pkgsrc.org> | 2011-12-03 22:46:30 +0000 |
|---|---|---|
| committer | jmmv <jmmv@pkgsrc.org> | 2011-12-03 22:46:30 +0000 |
| commit | 465a30addbbe0ab9a6b2349cc53bb685d4341a47 (patch) | |
| tree | 895fc996f447c8f66c9ac1ed5b4ef034a613a24d | |
| parent | de8519843de87dc809cf9466cdb45ab6badc2d19 (diff) | |
| download | pkgsrc-465a30addbbe0ab9a6b2349cc53bb685d4341a47.tar.gz | |
Disable address randomization under Darwin to fix build problems with
Xcode 4.1.
This does not fix all issues though, as the installation fails while
stripping the binaries. Not sure how to get rid of this yet, and it
seems to affect other packages as well.
| -rw-r--r-- | editors/emacs/Makefile.common | 9 | ||||
| -rw-r--r-- | editors/emacs/distinfo | 3 | ||||
| -rw-r--r-- | editors/emacs/patches/patch-ac | 18 |
3 files changed, 28 insertions, 2 deletions
diff --git a/editors/emacs/Makefile.common b/editors/emacs/Makefile.common index a1e9d5a85d0..052d5d0ac19 100644 --- a/editors/emacs/Makefile.common +++ b/editors/emacs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.29 2011/11/28 16:29:58 wiz Exp $ +# $NetBSD: Makefile.common,v 1.30 2011/12/03 22:46:30 jmmv Exp $ # # used by editors/emacs/Makefile # used by editors/emacs-nox11/Makefile @@ -56,6 +56,13 @@ CHECK_WRKREF_SKIP+= bin/emacs-${EMACS_VERSION} .include "../../mk/bsd.prefs.mk" +.if (${OPSYS} == "Darwin") +# Disable address randomization to fix build with Xcode 4.1. This is from +# upstream bug #8395. Details in: +# http://lists.gnu.org/archive/html/emacs-bug-tracker/2011-07/msg00445.html +CFLAGS+= -fno-pie +.endif + .if (${OPSYS} == "DragonFly") && exists(/usr/lib/crtn.o) CPPFLAGS+= -DDFLY_CRT_USRLIB .endif diff --git a/editors/emacs/distinfo b/editors/emacs/distinfo index 5a1c5780867..4c47713c991 100644 --- a/editors/emacs/distinfo +++ b/editors/emacs/distinfo @@ -1,10 +1,11 @@ -$NetBSD: distinfo,v 1.52 2011/11/28 16:29:58 wiz Exp $ +$NetBSD: distinfo,v 1.53 2011/12/03 22:46:30 jmmv Exp $ SHA1 (emacs-23.3b.tar.gz) = 56503472e99bc7c875ec370dec7b40774cfa82da RMD160 (emacs-23.3b.tar.gz) = d253874ecef5c09d35576cf508727f5863c80834 Size (emacs-23.3b.tar.gz) = 47930061 bytes SHA1 (patch-aa) = 951c1d9fe90fbe2c2366ba230106f8d165068d50 SHA1 (patch-ab) = 053243431964def524b7ba2f82ee78680ff7011e +SHA1 (patch-ac) = bcaff0bd9039c6326df900044a391e15f744af4a SHA1 (patch-ad) = e37f73048273801b8fd330d6897346b1f6e55fe9 SHA1 (patch-ae) = 116394051b3e2f4220ff5a3de3402923857940b9 SHA1 (patch-ag) = f462ad22762469360d90060afbc73e660e9f7db5 diff --git a/editors/emacs/patches/patch-ac b/editors/emacs/patches/patch-ac new file mode 100644 index 00000000000..1ff2a5a73f9 --- /dev/null +++ b/editors/emacs/patches/patch-ac @@ -0,0 +1,18 @@ +$NetBSD: patch-ac,v 1.22 2011/12/03 22:46:30 jmmv Exp $ + +http://lists.gnu.org/archive/html/emacs-bug-tracker/2011-07/msg00445.html + +Bug #8395: Disable address randomization under Darwin to fix compilation +with Xcode 4.1. + +--- src/s/darwin.h.orig 2011-11-26 03:20:20.000000000 +0000 ++++ src/s/darwin.h +@@ -181,7 +181,7 @@ along with GNU Emacs. If not, see <http + end of the header for adding load commands. Needed for dumping. + 0x690 is the total size of 30 segment load commands (at 56 + each); under Cocoa 31 commands are required. */ +-#define LD_SWITCH_SYSTEM_TEMACS -prebind LIBS_NSGUI -Xlinker -headerpad -Xlinker HEADERPAD_EXTRA ++#define LD_SWITCH_SYSTEM_TEMACS -fno-pie -prebind LIBS_NSGUI -Xlinker -headerpad -Xlinker HEADERPAD_EXTRA + + #define C_SWITCH_SYSTEM_TEMACS -Dtemacs + |