Revision
110391
Author
blair@macports.org
Date
2013-08-30 13:30:42 -0700 (Fri, 30 Aug 2013)

Log Message

zeroc-ice35-java: search and replace DYLD_LIBRARY_PATH everywhere.

This change will also modify SliceTask.java so running ant will not
set DYLD_LIBRARY_PATH.

Modified Paths

Removed Paths

Diff

Modified: trunk/dports/java/zeroc-ice35-java/Portfile (110390 => 110391)


--- trunk/dports/java/zeroc-ice35-java/Portfile	2013-08-30 20:23:39 UTC (rev 110390)
+++ trunk/dports/java/zeroc-ice35-java/Portfile	2013-08-30 20:30:42 UTC (rev 110391)
@@ -4,7 +4,7 @@
 
 name            zeroc-ice35-java
 version         3.5.0
-revision        1
+revision        2
 set branch      [join [lrange [split ${version} .] 0 1] .]
 categories      java devel
 maintainers     blair
@@ -36,8 +36,6 @@
 distname        Ice-${version}
 checksums       sha1   8501afaf86c0d62192cfc1b83c338178f73e98e9 \
                 sha256 583d4a819d50ad8b79b1e9ad45abfa3078f981486271ca8cd9ede8fa420ff575
-patchfiles      patch-ice.scripts.TestUtil.py.diff
-patch.pre_args  -p1
 
 platforms       darwin
 
@@ -49,6 +47,16 @@
                 port:jgoodies-looks \
                 port:proguard
 
+post-patch {
+    # Prevent core dumps from mixing Mac OS X's libstdc++.6.dylib
+    # on older operating systems, e.g. 10.5.8, with MacPorts'
+    # libstdc++.6.dylib from newer libgcc's, e.g. 4.8.1, through
+    # the use of DYLD_LIBRARY_PATH being set to $prefix, use
+    # DYLD_FALLBACK_LIBRARY_PATH instead.  This also have the ant
+    # slice task set DYLD_FALLBACK_LIBRARY_PATH instead of DYLD_LIBRARY_PATH.
+    system "find ${worksrcpath} -type f -print0 | xargs -0 grep -Z -l DYLD_LIBRARY_PATH | xargs -0 perl -w -p -i -e 's/DYLD_LIBRARY_PATH/DYLD_FALLBACK_LIBRARY_PATH/g'"
+}
+
 use_configure   no
 
 set classpath ${prefix}/lib/db46/db.jar:${prefix}/share/java/jgoodies-common.jar:${prefix}/share/java/jgoodies-forms.jar:${prefix}/share/java/jgoodies-looks.jar:${prefix}/share/java/proguard.jar