[PATCH 21.5] Fix build on OS X El Capitan

Marcus Crestani <[email protected]> Wed, 28 Oct 2015 08:59:24 +0100
Newsgroups gmane.emacs.xemacs.patches,gmane.spam.detected
Message-ID <[email protected]>
PATCH 21.5

Same procedure as last year: This is needed to disable address space
layout randomization on OS X, this time for El Capitan.

I'll commit in two days if nobody objects.

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-10-28  Marcus Crestani  <[email protected]>
+
+	* configure.ac: Disable ASLR on El Capitan.
+	* configure: Rebuild.
+
 2015-05-05  Stephen J. Turnbull  <[email protected]>

 	* configure.ac (Installation): Report all compiler switches.
diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -12234,7 +12234,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ASLR needs to be disabled" >&5
 $as_echo_n "checking whether ASLR needs to be disabled... " >&6; }
 case `uname -s`:`uname -r` in
-	    Darwin:1[1234].*)
+		    Darwin:1[12345].*)
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	LDFLAGS="$LDFLAGS -Wl,-no_pie" &&  if test "$verbose" = "yes"; then echo "    Appending \"-Wl,-no_pie\" to \$LDFLAGS"; fi
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -2842,8 +2842,9 @@
 dnl Disable ASLR on systems where it breaks pdump.
 AC_MSG_CHECKING([whether ASLR needs to be disabled])
 case `uname -s`:`uname -r` in
-	dnl Mac OS X 10.7 Lion, 10.8 Mountain Lion, 10.9 Mavericks, 10.10 Yosemite
-    Darwin:1[[1234]].*)
+	dnl Mac OS X 10.7 Lion, 10.8 Mountain Lion, 10.9 Mavericks,
+	dnl 10.10 Yosemite, 10.11 El Capitan
+    Darwin:1[[12345]].*)
 	AC_MSG_RESULT(yes)
 	XE_APPEND([-Wl,-no_pie], LDFLAGS)
 	;;

-- 
Marcus