[63790] trunk/dports/databases
ryandesign at macports.org
ryandesign at macports.org
Sun Feb 14 18:10:07 PST 2010
Revision: 63790
http://trac.macports.org/changeset/63790
Author: ryandesign at macports.org
Date: 2010-02-14 18:10:04 -0800 (Sun, 14 Feb 2010)
Log Message:
-----------
mysql5, mysql5-devel: remove -arch flags from mysql_config and mysqlbug scripts, which unbreaks these scripts for those using universal builds (they were broken by switching to the muniversal portgroup)
Modified Paths:
--------------
trunk/dports/databases/mysql5/Portfile
trunk/dports/databases/mysql5-devel/Portfile
Modified: trunk/dports/databases/mysql5/Portfile
===================================================================
--- trunk/dports/databases/mysql5/Portfile 2010-02-15 01:29:05 UTC (rev 63789)
+++ trunk/dports/databases/mysql5/Portfile 2010-02-15 02:10:04 UTC (rev 63790)
@@ -9,6 +9,7 @@
name mysql5
conflicts mysql5-devel mysql4
version 5.1.43
+revision 1
set branch [join [lrange [split ${version} .] 0 1] .]
homepage http://www.mysql.com/
categories databases
@@ -97,6 +98,22 @@
configure.cxxflags-append -fPIC
configure.args-append --with-embedded-server --with-pic
+post-build {
+ if {[variant_isset universal]} {
+ set dirs {}
+ foreach arch ${universal_archs_to_use} {
+ lappend dirs ${worksrcpath}-${arch}
+ }
+ } else {
+ set dirs ${worksrcpath}
+ }
+ foreach dir ${dirs} {
+ reinplace -E {s|-arch [a-z0-9_]+||g} \
+ ${dir}/scripts/mysql_config \
+ ${dir}/scripts/mysqlbug
+ }
+}
+
pre-destroot {
xinstall -m 755 -d ${destroot}${sysconfdir}
destroot.keepdirs-append ${destroot}${sysconfdir}
Modified: trunk/dports/databases/mysql5-devel/Portfile
===================================================================
--- trunk/dports/databases/mysql5-devel/Portfile 2010-02-15 01:29:05 UTC (rev 63789)
+++ trunk/dports/databases/mysql5-devel/Portfile 2010-02-15 02:10:04 UTC (rev 63790)
@@ -9,6 +9,7 @@
name mysql5-devel
conflicts mysql5 mysql4
version 5.5.1-m2
+revision 1
set branch [join [lrange [split ${version} .] 0 1] .]
homepage http://www.mysql.com/
categories databases
@@ -113,6 +114,9 @@
${dir}/plugin/semisync/.libs/semisync_master.lai \
${dir}/plugin/semisync/.libs/semisync_slave.lai \
${dir}/storage/example/.libs/ha_example.lai
+ reinplace -E {s|-arch [a-z0-9_]+||g} \
+ ${dir}/scripts/mysql_config \
+ ${dir}/scripts/mysqlbug
}
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100214/520d3ef3/attachment.html>
More information about the macports-changes
mailing list