[84811] trunk/dports/devel/glib1

[ryandesign at macports.org]

Revision: 84811
          http://trac.macports.org/changeset/84811
Author:   ryandesign at macports.org
Date:     2011-10-02 05:06:08 -0700 (Sun, 02 Oct 2011)
Log Message:
-----------
glib1: fix build for non-default build_arch; see #21413

Modified Paths:
--------------
    trunk/dports/devel/glib1/Portfile
    trunk/dports/devel/glib1/files/patch-ltmain.sh.diff

Modified: trunk/dports/devel/glib1/Portfile
===================================================================
--- trunk/dports/devel/glib1/Portfile	2011-10-02 11:42:06 UTC (rev 84810)
+++ trunk/dports/devel/glib1/Portfile	2011-10-02 12:06:08 UTC (rev 84811)
@@ -57,10 +57,10 @@
                             patch-glib.m4
 
 post-patch {
-    system "cp ${distpath}/ltconfig13 ${worksrcpath}/ltconfig"
-    system "cp ${distpath}/ltmain13 ${worksrcpath}/ltmain.sh"
-    # fix ltmain.sh to handle universal library creation.
-    system "cd ${worksrcpath} && patch -p0 < ${filespath}/patch-ltmain.sh.diff"
+    file copy -force ${distpath}/ltconfig13 ${worksrcpath}/ltconfig
+    file copy -force ${distpath}/ltmain13 ${worksrcpath}/ltmain.sh
+    # fix ltmain.sh to handle -arch flags
+    system -W ${worksrcpath} "patch -p0 < ${filespath}/patch-ltmain.sh.diff"
 }
 
 configure.ccache            no

Modified: trunk/dports/devel/glib1/files/patch-ltmain.sh.diff
===================================================================
--- trunk/dports/devel/glib1/files/patch-ltmain.sh.diff	2011-10-02 11:42:06 UTC (rev 84810)
+++ trunk/dports/devel/glib1/files/patch-ltmain.sh.diff	2011-10-02 12:06:08 UTC (rev 84811)
@@ -1,25 +1,29 @@
---- ltmain.sh.orig	2010-12-14 14:01:46.000000000 -0500
-+++ ltmain.sh	2010-12-14 14:14:41.000000000 -0500
-@@ -1239,6 +1239,11 @@
+--- ltmain.sh.orig	2011-10-02 06:54:21.000000000 -0500
++++ ltmain.sh	2011-10-02 06:54:58.000000000 -0500
+@@ -979,6 +979,13 @@
  	  prev=
  	  continue
  	  ;;
 +        xarch)
-+          linkopts="$linkopts $arg"
++	  linkopts="$linkopts $arg"
++	  compile_command="$compile_command $arg"
++	  finalize_command="$finalize_command $arg"
 +	  prev=
 +	  continue
 +          ;;
  	*)
  	  eval "$prev=\"\$arg\""
  	  prev=
-@@ -1264,6 +1269,14 @@
+@@ -1004,6 +1011,16 @@
  	continue
  	;;
  
 +      # Darwin uses the -arch flag to determine output architecture.
-+      # Add it to the link options for "archive_cmds".
++      # Add it to the link options and compile and finalize commands.
 +      -arch)
 +	linkopts="$linkopts $arg"
++	compile_command="$compile_command $arg"
++	finalize_command="$finalize_command $arg"
 +	prev=xarch
 +	continue
 +	;;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111002/2c3e4bbf/attachment.html>