[PATCH 21.5] Fix build on OS X Yosemite

Marcus Crestani <[email protected]> Fri, 10 Oct 2014 14:37:03 +0200
Newsgroups gmane.emacs.xemacs.patches
Message-ID <[email protected]>
PATCH 21.5

To build XEmacs on OS X 10.10 Yosemite, we need to disable address space
layout randomization.

I'll commit in two days if nobody objects.

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-10  Marcus Crestani  <[email protected]>
+        
+       * configure.ac: Disable ASLR on Yosemite.
+       * configure: Rebuild.
+
 2014-10-09  Jerry James  <[email protected]>
 
        * configure.ac: Check for TLS headers as well as libraries.
diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -12226,7 +12226,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[123].*)
+           Darwin:1[1234].*)
        { $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
@@ -2820,8 +2820,8 @@
 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
-    Darwin:1[[123]].*)
+       dnl Mac OS X 10.7 Lion, 10.8 Mountain Lion, 10.9 Mavericks, 10.10 Yosemite
+    Darwin:1[[1234]].*)
        AC_MSG_RESULT(yes)
        XE_APPEND([-Wl,-no_pie], LDFLAGS) 
        ;;

-- 
Marcus