[95751] trunk/dports/devel/poco/Portfile

ryandesign at macports.org ryandesign at macports.org
Sat Jul 21 01:38:56 PDT 2012


Revision: 95751
          https://trac.macports.org/changeset/95751
Author:   ryandesign at macports.org
Date:     2012-07-21 01:38:56 -0700 (Sat, 21 Jul 2012)
Log Message:
-----------
poco: fix install_names; simplify mysql variant; do reinplaces in post-patch not pre-configure

Modified Paths:
--------------
    trunk/dports/devel/poco/Portfile

Modified: trunk/dports/devel/poco/Portfile
===================================================================
--- trunk/dports/devel/poco/Portfile	2012-07-21 08:36:56 UTC (rev 95750)
+++ trunk/dports/devel/poco/Portfile	2012-07-21 08:38:56 UTC (rev 95751)
@@ -5,6 +5,7 @@
 
 name            poco
 version         1.4.3p1
+revision        1
 categories      devel
 maintainers     nomaintainer
 platforms       darwin
@@ -63,11 +64,15 @@
 
 pre-configure {
     configure.args-append   --omit=[join ${omit} ,]
+}
 
+post-patch {
     reinplace -E "/^C(XX)?FLAGS +=/s|\$| ${configure.cppflags} ${configure.cflags}|" \
         ${worksrcpath}/build/config/${config}
     reinplace -E "/^((SH|DY)LIB|LINKFLAGS) +=/s|\$| -L\$(LIBPATH) ${configure.ldflags}|" \
         ${worksrcpath}/build/config/${config}
+    reinplace -E "/^SHLIB +=/s|\$| -Wl,-install_name,${prefix}/lib/\$(notdir \$@)|" \
+        ${worksrcpath}/build/config/${config}
 }
 
 use_parallel_build  yes
@@ -112,25 +117,6 @@
         xinstall -d ${destroot}${docdir}/html
         xinstall -m 0644 -W ${worksrcpath}/doc Acknowledgements.html ${destroot}${docdir}/html
     }
-
-    set libdir ${prefix}/lib
-
-    foreach {dylib} [glob -types f -tails -directory ${destroot}${libdir} *.dylib] {
-        system "install_name_tool -id ${libdir}/${dylib} ${destroot}${libdir}/${dylib}"
-
-        set otool [lrange [split [exec otool -L ${destroot}${libdir}/${dylib}] \n] 2 end]
-
-        foreach {otoolentry} ${otool} {
-            set lib [lindex ${otoolentry} 0]
-
-            if {! [string match ${worksrcpath}/* ${lib}]} {
-                continue
-            }
-
-            system "install_name_tool -change ${lib} ${libdir}/[file tail ${lib}] \
-                ${destroot}${libdir}/${dylib}"
-        }
-    }
 }
 
 variant ssl description {Build NetSSL and Crypto library} {
@@ -146,12 +132,8 @@
 variant mysql description {Build MySQL backend for Data library} {
     depends_lib-append      path:bin/mysql_config5:mysql5
 
-    post-configure {
-        reinplace -E "/^C(XX)?FLAGS +=/s|\$| -I${prefix}/include/mysql5/mysql|" \
-            ${worksrcpath}/build/config/${config}
-        reinplace -E "/^((SH|DY)LIB|LINKFLAGS) +=/s|\$| -L${prefix}/lib/mysql5/mysql|" \
-            ${worksrcpath}/build/config/${config}
-    }
+    configure.cppflags-append   -I${prefix}/include/mysql5/mysql
+    configure.ldflags-append    -L${prefix}/lib/mysql5/mysql
 
     set omit [ldelete ${omit} Data/MySQL]
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120721/7396e357/attachment.html>


More information about the macports-changes mailing list