[73068] users/dports/ports/tex/texlive-bin

[dports at macports.org]

Revision: 73068
          http://trac.macports.org/changeset/73068
Author:   dports at macports.org
Date:     2010-11-02 19:47:10 -0700 (Tue, 02 Nov 2010)
Log Message:
-----------
texlive-bin: remove $prefix/lib from $LIBRARY_PATH during icu build
(only) to prevent conflicts between texlive icu libs and those
installed by the icu port.

Shouldn't be necessary because gcc should search the library paths
provided with -L the command line before LIBRARY_PATH, but appears
that isn't happening...

Modified Paths:
--------------
    users/dports/ports/tex/texlive-bin/Portfile

Added Paths:
-----------
    users/dports/ports/tex/texlive-bin/files/patch-libs_icu_Makefile.in.diff

Modified: users/dports/ports/tex/texlive-bin/Portfile
===================================================================
--- users/dports/ports/tex/texlive-bin/Portfile	2010-11-03 02:27:13 UTC (rev 73067)
+++ users/dports/ports/tex/texlive-bin/Portfile	2010-11-03 02:47:10 UTC (rev 73068)
@@ -57,6 +57,7 @@
                 path:bin/pkg-config:pkgconfig
 
 patchfiles      patch-configure \
+                patch-libs_icu_Makefile.in.diff \
                 patch-libs_icu_icu-4.4_configure.diff \
                 patch-libs-freetype-Makefile.in.diff \
                 patch-texk_texlive_linked_scripts_Makefile.in.diff \

Added: users/dports/ports/tex/texlive-bin/files/patch-libs_icu_Makefile.in.diff
===================================================================
--- users/dports/ports/tex/texlive-bin/files/patch-libs_icu_Makefile.in.diff	                        (rev 0)
+++ users/dports/ports/tex/texlive-bin/files/patch-libs_icu_Makefile.in.diff	2010-11-03 02:47:10 UTC (rev 73068)
@@ -0,0 +1,15 @@
+--- libs/icu/Makefile.in.orig	2010-11-02 20:11:12.000000000 -0400
++++ libs/icu/Makefile.in	2010-11-02 20:20:35.000000000 -0400
+@@ -198,6 +198,12 @@
+ SUBDIRS = . $(am__append_1)
+ EXTRA_DIST = $(ICU_TREE) license.html $(ICU_TREE)-PATCHES
+ @cross_TRUE at ICU_NATIVE = icu-native/config/icucross.mk
++
++# MacPorts: remove $prefix/lib from LIBRARY_PATH to prevent gcc from
++# trying to link against libraries from the icu port
++export LIBRARY_PATH=
++
++
+ all: all-recursive
+ 
+ .SUFFIXES:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101102/1d809918/attachment.html>