Revision: 74385
http://trac.macports.org/changeset/74385
Author: michaelld at macports.org
Date: 2010-12-14 12:36:13 -0800 (Tue, 14 Dec 2010)
Log Message:
-----------
glib1: Patch ltmain.sh to allow for +universal building.
Modified Paths:
--------------
trunk/dports/devel/glib1/Portfile
Added Paths:
-----------
trunk/dports/devel/glib1/files/patch-ltmain.sh.diff
Modified: trunk/dports/devel/glib1/Portfile
===================================================================
--- trunk/dports/devel/glib1/Portfile 2010-12-14 14:03:44 UTC (rev 74384)
+++ trunk/dports/devel/glib1/Portfile 2010-12-14 20:36:13 UTC (rev 74385)
@@ -31,17 +31,20 @@
depends_lib port:gettext
depends_build port:pkgconfig
-# fails, see #16716
-universal_variant no
-
-pre-patch { system "cp ${distpath}/ltconfig13 ${worksrcpath}/ltconfig"
- system "cp ${distpath}/ltmain13 ${worksrcpath}/ltmain.sh" }
-
patchfiles patch-configure patch-config.guess patch-config.sub \
patch-gmain.c patch-glib.h patch-gutils.c 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"
+}
+
configure.ccache no
-configure.cflags-append "-I${prefix}/include"
+configure.ldflags-delete "-L${prefix}/lib"
+configure.cppflags-delete "-I${prefix}/include"
configure.args --disable-static --mandir=${prefix}/share/man \
--infodir=${prefix}/share/info
Added: trunk/dports/devel/glib1/files/patch-ltmain.sh.diff
===================================================================
--- trunk/dports/devel/glib1/files/patch-ltmain.sh.diff (rev 0)
+++ trunk/dports/devel/glib1/files/patch-ltmain.sh.diff 2010-12-14 20:36:13 UTC (rev 74385)
@@ -0,0 +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 @@
+ prev=
+ continue
+ ;;
++ xarch)
++ linkopts="$linkopts $arg"
++ prev=
++ continue
++ ;;
+ *)
+ eval "$prev=\"\$arg\""
+ prev=
+@@ -1264,6 +1269,14 @@
+ continue
+ ;;
+
++ # Darwin uses the -arch flag to determine output architecture.
++ # Add it to the link options for "archive_cmds".
++ -arch)
++ linkopts="$linkopts $arg"
++ prev=xarch
++ continue
++ ;;
++
+ -avoid-version)
+ avoid_version=yes
+ continue
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101214/799656c9/attachment.html>