[81853] trunk/dports/editors/emacs22

[dports at macports.org]

Revision: 81853
          http://trac.macports.org/changeset/81853
Author:   dports at macports.org
Date:     2011-08-05 20:34:50 -0700 (Fri, 05 Aug 2011)
Log Message:
-----------
emacs22: fix build on Lion and Xcode 4.

[merge of r77151 and r79673 from emacs port]

Revision Links:
--------------
    http://trac.macports.org/changeset/77151
    http://trac.macports.org/changeset/79673

Modified Paths:
--------------
    trunk/dports/editors/emacs22/Portfile

Added Paths:
-----------
    trunk/dports/editors/emacs22/files/patch-unexmacosx.c-2.diff

Property Changed:
----------------
    trunk/dports/editors/emacs22/
    trunk/dports/editors/emacs22/Portfile


Property changes on: trunk/dports/editors/emacs22
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk/dports/editors/emacs:77151

Modified: trunk/dports/editors/emacs22/Portfile
===================================================================
--- trunk/dports/editors/emacs22/Portfile	2011-08-06 03:28:51 UTC (rev 81852)
+++ trunk/dports/editors/emacs22/Portfile	2011-08-06 03:34:50 UTC (rev 81853)
@@ -7,6 +7,7 @@
 name            emacs22
 version         22.3
 revision        4
+revision        1
 
 categories      editors
 license         GPL-3+
@@ -31,6 +32,7 @@
 patchfiles      patch-Makefile.in.diff \
                 patch-leim-Makefile.in.diff \
                 patch-unexmacosx.c.diff \
+                patch-unexmacosx.c-2.diff \
                 patch-s-darwin.h.diff \
                 patch-configure-ignore-xaw3d.diff
 
@@ -92,6 +94,10 @@
                             lib:libpng:libpng
 }
 
+platform darwin 11 {
+    configure.ldflags-append -Wl,-no_pie
+}
+
 variant motif requires x11 description {Builds emacs as an X11 program with Motif widgets} {
     configure.args-delete   --with-x-toolkit=lucid
     configure.args-append   --with-x-toolkit=motif


Property changes on: trunk/dports/editors/emacs22/Portfile
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk/dports/editors/emacs/Portfile:77151,79673

Copied: trunk/dports/editors/emacs22/files/patch-unexmacosx.c-2.diff (from rev 81848, trunk/dports/editors/emacs/files/patch-src_unexmacosx.c.diff)
===================================================================
--- trunk/dports/editors/emacs22/files/patch-unexmacosx.c-2.diff	                        (rev 0)
+++ trunk/dports/editors/emacs22/files/patch-unexmacosx.c-2.diff	2011-08-06 03:34:50 UTC (rev 81853)
@@ -0,0 +1,10 @@
+--- src/unexmacosx.c.orig	2011-01-08 12:45:14.000000000 -0500
++++ src/unexmacosx.c	2011-03-21 04:44:57.000000000 -0400
+@@ -822,6 +822,7 @@
+ 	}
+       else if (strncmp (sectp->sectname, "__la_symbol_ptr", 16) == 0
+ 	       || strncmp (sectp->sectname, "__nl_symbol_ptr", 16) == 0
++	       || strncmp (sectp->sectname, "__got", 16) == 0
+ 	       || strncmp (sectp->sectname, "__la_sym_ptr2", 16) == 0
+ 	       || strncmp (sectp->sectname, "__dyld", 16) == 0
+ 	       || strncmp (sectp->sectname, "__const", 16) == 0
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110805/b353b590/attachment.html>