[csw-devel] SF.net SVN: gar:[19064] csw/mgar/pkg/texlive/trunk

[pfelecan at users.sourceforge.net]

Revision: 19064
          http://gar.svn.sourceforge.net/gar/?rev=19064&view=rev
Author:   pfelecan
Date:     2012-08-22 14:04:39 +0000 (Wed, 22 Aug 2012)
Log Message:
-----------
texlive/trunk:
- builds even on the build farm
- the non splited package is too big
- not ready for release

Modified Paths:
--------------
    csw/mgar/pkg/texlive/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/texlive/trunk/files/0002-Fix-ICU-link-edit.patch

Modified: csw/mgar/pkg/texlive/trunk/Makefile
===================================================================
--- csw/mgar/pkg/texlive/trunk/Makefile	2012-08-22 13:54:11 UTC (rev 19063)
+++ csw/mgar/pkg/texlive/trunk/Makefile	2012-08-22 14:04:39 UTC (rev 19064)
@@ -23,6 +23,7 @@
 DISTFILES		+=	$(DISTNAMEPREFIX)-extra.tar.xz
 DISTFILES		+=	$(DISTNAMEPREFIX)-texmf.tar.xz
 PATCHFILES		+=	0001-Fix-lacheck-buffer-overflow.patch
+PATCHFILES		+=	0002-Fix-ICU-link-edit.patch
 
 PACKAGING_PLATFORMS	=	solaris10-sparc
 PACKAGING_PLATFORMS	+=	solaris10-i386
@@ -30,6 +31,9 @@
 BUILD_DEP_PKGS	+=	CSWpoppler-dev
 BUILD_DEP_PKGS	+=	CSWpoppler-dev
 BUILD_DEP_PKGS	+=	CSWclisp
+# when this is installed, raises undefined symbols when linking
+# tools/genrb; this is the reason form 0002-Fix-ICU-link-edit.patch
+# BUILD_DEP_PKGS += CSWlibicu-dev
 
 EXTRA_CFLAGS	+=	-std=gnu99 -D_XPG6
 EXTRA_CXXFLAGS	+=	-D_XPG6
@@ -62,6 +66,8 @@
 CONFIGURE_ARGS	+=	--with-mf-x-toolkit
 CONFIGURE_ARGS	+=	--with-system-freetype2
 CONFIGURE_ARGS	+=	--with-system-gd
+# cannot be used as ICU delivered by OpenCSW is compiled with Sun Studio C++
+#CONFIGURE_ARGS	+=	--with-system-icu
 CONFIGURE_ARGS	+=	--with-system-libgs
 CONFIGURE_ARGS	+=	--with-system-libpng
 # poppler, C++, is compiled with Sun Studio
@@ -95,6 +101,8 @@
 	cd $(OBJDIR)/texk/ptexenc && gsed --in-place --expression='s;-L/opt/csw/lib;;g' libptexenc.la
 	$(MAKECOOKIE)
 
+# install the texmf and texmf-dist but exclude those components
+# provided by the source archive:
 post-install-modulated: xdup = --exclude=texmf/doc/xindy/alphabets-doc.pdf
 post-install-modulated: xdup += --exclude=texmf/doc/xindy/tex2xindy.pdf
 post-install-modulated: xdup += --exclude=texmf/doc/xindy/texindy.pdf

Added: csw/mgar/pkg/texlive/trunk/files/0002-Fix-ICU-link-edit.patch
===================================================================
--- csw/mgar/pkg/texlive/trunk/files/0002-Fix-ICU-link-edit.patch	                        (rev 0)
+++ csw/mgar/pkg/texlive/trunk/files/0002-Fix-ICU-link-edit.patch	2012-08-22 14:04:39 UTC (rev 19064)
@@ -0,0 +1,29 @@
+From f811de609d006bf6bfcc2c94f931ba994fdec962 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Wed, 22 Aug 2012 10:08:24 +0200
+Subject: [PATCH] Fix ICU link edit
+
+When the OpenCSW supplied ICU is installed, which is built with Sun Studio,
+the link editor tries to link with the corresponding libraries and it doesn't
+find the references as the mangling method is different from that used by GCC.
+The same reason applies to inhibiting the usage of the system level ICU.
+---
+ libs/icu/icu-49.1/icudefs.mk.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libs/icu/icu-49.1/icudefs.mk.in b/libs/icu/icu-49.1/icudefs.mk.in
+index d753e29..7bd616d 100644
+--- a/libs/icu/icu-49.1/icudefs.mk.in
++++ b/libs/icu/icu-49.1/icudefs.mk.in
+@@ -151,7 +151,7 @@ ENABLE_RPATH = @ENABLE_RPATH@
+ ifeq ($(ENABLE_RPATH),YES)
+ RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir)
+ endif
+-LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS)
++LDFLAGS = $(subst -L/opt/csw/lib,, at LDFLAGS@) $(RPATHLDFLAGS)
+ 
+ # What kind of libraries are we building and linking against?
+ ENABLE_STATIC = @ENABLE_STATIC@
+-- 
+1.7.11.3
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.