[78758] trunk/dports/textproc/xercesc/Portfile

[jmr at macports.org]

Revision: 78758
          http://trac.macports.org/changeset/78758
Author:   jmr at macports.org
Date:     2011-05-21 08:03:18 -0700 (Sat, 21 May 2011)
Log Message:
-----------
xercesc: fix incorrect use of muniversal that was added in r62014 (closes #14396)

Revision Links:
--------------
    http://trac.macports.org/changeset/62014

Modified Paths:
--------------
    trunk/dports/textproc/xercesc/Portfile

Modified: trunk/dports/textproc/xercesc/Portfile
===================================================================
--- trunk/dports/textproc/xercesc/Portfile	2011-05-21 14:54:47 UTC (rev 78757)
+++ trunk/dports/textproc/xercesc/Portfile	2011-05-21 15:03:18 UTC (rev 78758)
@@ -25,11 +25,9 @@
 patchfiles		64-bit-no-carbon.diff
 
 configure.dir		${worksrcpath}/src/xercesc
-configure.env		XERCESCROOT=${worksrcpath}
 configure.pre_args	-P "${prefix}"
 configure.args		-c ${configure.cc} \
-			-x ${configure.cxx} \
-			-z -I${worksrcpath}/src
+			-x ${configure.cxx}
 configure.cmd		./runConfigure
 configure.universal_args-delete --disable-dependency-tracking
 
@@ -43,16 +41,22 @@
 }
 
 if {[variant_isset universal]} {
-	foreach arch {x86_64 ppc64 i386 ppc} {
-		set merger_configure_args(${arch}) [bits_arg_for_arch ${arch}]
+	foreach arch ${configure.universal_archs} {
+		set merger_configure_args(${arch}) "-z -I${worksrcpath}-${arch}/src [bits_arg_for_arch ${arch}]"
+		set merger_configure_env(${arch}) XERCESCROOT=${worksrcpath}-${arch}
+		set merger_build_env(${arch}) $merger_configure_env(${arch})
+		set merger_destroot_env(${arch}) $merger_configure_env(${arch})
 	}
 } else {
-	configure.args-append [bits_arg_for_arch ${configure.build_arch}]
+	configure.args-append -z -I${worksrcpath}/src \
+	                      [bits_arg_for_arch ${configure.build_arch}]
+	configure.env	XERCESCROOT=${worksrcpath}
+	build.env		${configure.env}
+	destroot.env	${configure.env}
 }
 
 use_parallel_build	no
 build.dir		${worksrcpath}/src/xercesc
-build.env		${configure.env}
 build.type		gnu
 
 platform darwin	{
@@ -60,19 +64,37 @@
 }
 
 post-build {
-	xinstall -m 755 -W ${filespath} makestatic.sh.in ${build.dir}/makestatic.sh
-	reinplace s|@CXX@|${configure.cxx}| ${build.dir}/makestatic.sh
-	system "cd ${build.dir} && ${build.env} ./makestatic.sh"
+    if {![variant_isset universal]} {
+        xinstall -m 755 -W ${filespath} makestatic.sh.in ${build.dir}/makestatic.sh
+        reinplace s|@CXX@|${configure.cxx}| ${build.dir}/makestatic.sh
+        system "cd ${build.dir} && ${build.env} ./makestatic.sh"
+	} else {
+	    foreach arch ${configure.universal_archs} {
+	        set arch_build_dir [string map "${worksrcpath} ${worksrcpath}-${arch}" ${build.dir}]
+            xinstall -m 755 -W ${filespath} makestatic.sh.in ${arch_build_dir}/makestatic.sh
+            reinplace s|@CXX@|${configure.cxx}| ${arch_build_dir}/makestatic.sh
+            system "cd ${arch_build_dir} && $merger_build_env(${arch}) ./makestatic.sh"
+        }
+	}
 }
 
-destroot.env		${configure.env}
-
-post-destroot	{
-	xinstall ${worksrcpath}/lib/libxerces-c.a ${destroot}${prefix}/lib
-	system "ranlib ${destroot}${prefix}/lib/libxerces-c.a"
+pre-destroot	{
+    if {![variant_isset universal]} {
+        xinstall -d -m 755 ${destroot}${prefix}/lib
+	    xinstall ${worksrcpath}/lib/libxerces-c.a ${destroot}${prefix}/lib
+	} else {
+	    foreach arch ${configure.universal_archs} {
+	        xinstall -d -m 755 ${destroot}-${arch}${prefix}/lib
+	        xinstall ${worksrcpath}-${arch}/lib/libxerces-c.a ${destroot}-${arch}${prefix}/lib
+	    }
+	}
 	
 	xinstall -d -m 755 ${destroot}${prefix}/share/doc
 	file copy ${worksrcpath}/doc/html ${destroot}${prefix}/share/doc/${name}
 	xinstall -m 644 -W ${worksrcpath} version.incl LICENSE.txt Readme.html \
 		credits.txt ${destroot}${prefix}/share/doc/${name}
 }
+
+post-destroot {
+    system "ranlib ${destroot}${prefix}/lib/libxerces-c.a"
+}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110521/c9a4dd41/attachment.html>