[123758] trunk/dports/devel/icu

[ryandesign at macports.org]

Revision: 123758
          https://trac.macports.org/changeset/123758
Author:   ryandesign at macports.org
Date:     2014-08-13 16:45:45 -0700 (Wed, 13 Aug 2014)
Log Message:
-----------
icu: do not use -rpath; it is not compatible with Tiger

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

Added Paths:
-----------
    trunk/dports/devel/icu/files/patch-config-mh-darwin.diff

Modified: trunk/dports/devel/icu/Portfile
===================================================================
--- trunk/dports/devel/icu/Portfile	2014-08-13 23:19:13 UTC (rev 123757)
+++ trunk/dports/devel/icu/Portfile	2014-08-13 23:45:45 UTC (rev 123758)
@@ -11,6 +11,7 @@
 # To find dependencies, use:
 # port file all | sort -u | xargs grep -E ':icu( |$)' | cut -d / -f 12 | sort -u
 version         53.1
+revision        1
 categories      devel textproc
 platforms       darwin freebsd
 license         MIT
@@ -37,6 +38,8 @@
 worksrcdir      ${name}/source
 set docdir      ${prefix}/share/doc/${name}
 
+patchfiles      patch-config-mh-darwin.diff
+
 # icu appends -O2 to the cflags and cxxflags
 configure.optflags-delete -Os
 
@@ -78,7 +81,7 @@
             }
             
             # Removing architecture specific information from the Makefile include files is necessary to merge them correctly.
-            # It is concivable that this could cause problems for certain projects.
+            # It is conceivable that this could cause problems for certain projects.
             # The developers of ICU suggest using pkg-config over both icu-config and the Makefile includes.
             reinplace {s| -DSIZEOF_VOID_P=[48]||g} ${dir}${prefix}/lib/icu/${version}/Makefile.inc
             reinplace -E {s:-arch +[^ ]+::g} ${dir}${prefix}/lib/icu/${version}/pkgdata.inc
@@ -93,19 +96,11 @@
     }
 }
 
-post-destroot {
-    # The ICU build mechanism passes rpath to the linker, but this should not be necessary if the shared libraries were built correctly.
-    reinplace {s|^default_ENABLE_RPATH="YES"$|default_ENABLE_RPATH="NO"|g} ${destroot}${prefix}/bin/icu-config
-    reinplace -E {s| -Wl,-rpath,.+/lib||g} ${destroot}${prefix}/lib/icu/${version}/pkgdata.inc
-}
-
 set platform [switch ${os.platform} {darwin {format MacOSX} freebsd {format FreeBSD}}]
 configure.cmd   ./runConfigureICU ${platform}
 
-# enable-rpath forces ICU to build the shared library correctly (with directory name in -install_name)
 configure.args  --enable-static \
-                --disable-samples \
-                --enable-rpath
+                --disable-samples
 
 configure.universal_args-delete --disable-dependency-tracking
 if {[variant_isset universal]} {

Copied: trunk/dports/devel/icu/files/patch-config-mh-darwin.diff (from rev 120842, trunk/dports/devel/icu/files/patch-config-mh-darwin.diff)
===================================================================
--- trunk/dports/devel/icu/files/patch-config-mh-darwin.diff	                        (rev 0)
+++ trunk/dports/devel/icu/files/patch-config-mh-darwin.diff	2014-08-13 23:45:45 UTC (rev 123758)
@@ -0,0 +1,14 @@
+--- config/mh-darwin.orig	2012-09-10 19:00:37.000000000 -0500
++++ config/mh-darwin	2014-08-13 17:12:02.000000000 -0500
+@@ -28,11 +28,7 @@
+ SHLIB.cc=	$(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) $(LD_SOOPTIONS)
+ 
+ ## Compiler switches to embed a library name and version information
+-ifeq ($(ENABLE_RPATH),YES)
+ LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET))
+-else
+-LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET))
+-endif
+ 
+ ## Compiler switch to embed a runtime search path
+ LD_RPATH=


Property changes on: trunk/dports/devel/icu/files/patch-config-mh-darwin.diff
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/mld-qt-481/dports/devel/icu/files/patch-config-mh-darwin.diff:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/cal/ports/devel/icu/files/patch-config-mh-darwin.diff:96570-97031
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140813/24ed319d/attachment.html>