[csw-devel] SF.net SVN: gar:[4183] csw/mgar/pkg/librsvg/trunk

hson at users.sourceforge.net hson at users.sourceforge.net
Sat Apr 4 20:33:29 CEST 2009


Revision: 4183
          http://gar.svn.sourceforge.net/gar/?rev=4183&view=rev
Author:   hson
Date:     2009-04-04 18:33:28 +0000 (Sat, 04 Apr 2009)

Log Message:
-----------
librsvg: Use fixme to fix libtool problem

Modified Paths:
--------------
    csw/mgar/pkg/librsvg/trunk/Makefile
    csw/mgar/pkg/librsvg/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/librsvg/trunk/files/fixme.sh

Modified: csw/mgar/pkg/librsvg/trunk/Makefile
===================================================================
--- csw/mgar/pkg/librsvg/trunk/Makefile	2009-04-04 18:08:40 UTC (rev 4182)
+++ csw/mgar/pkg/librsvg/trunk/Makefile	2009-04-04 18:33:28 UTC (rev 4183)
@@ -19,6 +19,7 @@
 
 MASTER_SITES = http://ftp.gnome.org/pub/GNOME/sources/librsvg/$(GARVERSION)/
 DISTFILES  = $(GARNAME)-$(GARVERSION).$(GARSUBREV).tar.bz2
+DISTFILES += fixme.sh
 
 DISTNAME = $(GARNAME)-$(GARVERSION).$(GARSUBREV)
 
@@ -50,6 +51,11 @@
 
 include gar/category.mk
 
+post-configure-modulated:
+	@(echo "~~~ Fixing Libtool ~~~")
+	@$(DOWNLOADDIR)/fixme.sh $(WORKSRC)
+	$(DONADA)
+
 post-install-isa-sparcv8:
 	@cp $(FILEDIR)/librsvg-2.so.2.15.90.s $(INSTALLISADIR)/opt/csw/lib/librsvg-2.so.2.15.90
 

Modified: csw/mgar/pkg/librsvg/trunk/checksums
===================================================================
--- csw/mgar/pkg/librsvg/trunk/checksums	2009-04-04 18:08:40 UTC (rev 4182)
+++ csw/mgar/pkg/librsvg/trunk/checksums	2009-04-04 18:33:28 UTC (rev 4183)
@@ -1,7 +1,5 @@
 c4ec4fdb2b1842e221ca39127e85682d  download/librsvg-2.22.3.tar.bz2
-300ffe1b2413261b5ce5e451c8c7d0eb  download/librsvg-2.so.2.15.90.i
-5e90964c1f99f46100f71cdb3d549fcc  download/librsvg-2.so.2.15.90.s
-d2491b9b8f422321a88f0414f5e78196  download/CSWlibrsvg.gspec
+70771682427d524354d50482371edca5  download/fixme.sh
 5b0c0387946c3b7ca7feb913de436936  download/pdiff.patch
 8a26f6d0d0cf1cfce1a1e0365c6624ce  download/perceptualdiff.patch
 803a5d10e3e9c9a561b397aade043024  download/test_makefiles.patch

Added: csw/mgar/pkg/librsvg/trunk/files/fixme.sh
===================================================================
--- csw/mgar/pkg/librsvg/trunk/files/fixme.sh	                        (rev 0)
+++ csw/mgar/pkg/librsvg/trunk/files/fixme.sh	2009-04-04 18:33:28 UTC (rev 4183)
@@ -0,0 +1,49 @@
+#!/bin/bash
+####################################################
+#
+#  fixme.sh
+#  Intended to remove the use of libtool's 
+#  pseudo-libraries for opencsw builds.
+#
+#  Author: Mike Watters  mwatters_at_opencsw.org
+#  Initial Version: 0.1
+#
+####################################################
+
+umask 0022
+PATH=/opt/csw/bin
+
+if [ $# -ne 1 ]; then
+    gecho "USAGE: $(basename $0) WORKSRC"
+    exit 1
+fi
+BASEPATH=$1
+
+## Fix Makefiles
+for mk in $(gfind ${BASEPATH} -name Makefile -print); do
+    LT_FILES=$(ggrep '/opt/csw.*/lib/.*.la' ${mk} | \
+        gsed "s/^.*\(\/opt\/csw.*\/lib\/.*\.la\).*$/\1/")
+    
+    for file in ${LT_FILES}; do
+        LIB_NAME=$(ggrep 'dlname=' ${file} | \
+            gsed -e "s/.*'\(.*\)'/\1/" \
+                -e "s/^lib//" \
+                -e "s/\.so.*$//")
+        fixpath=$(gecho $file |gsed 's/\//\\\//g')
+        sed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >Makefile.new
+        gmv Makefile.new ${mk}
+    done
+done
+
+## Fix libtool Script
+for lt in $(gfind ${BASEPATH} -name libtool -print); do
+    gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new
+    gmv ${lt}.new ${lt}
+done
+
+LTMAIN=$(gfind ${BASEPATH} -name ltmain.sh -print)
+if [ -f ${LTMAIN} ]; then
+    gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new
+    gmv ${LTMAIN}.new ${LTMAIN}
+fi
+


Property changes on: csw/mgar/pkg/librsvg/trunk/files/fixme.sh
___________________________________________________________________
Added: svn:executable
   + *


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



More information about the devel mailing list