[csw-devel] SF.net SVN: gar:[4184] csw/mgar/pkg/wmf/trunk

hson at users.sourceforge.net hson at users.sourceforge.net
Sat Apr 4 20:34:36 CEST 2009


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

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

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

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

Modified: csw/mgar/pkg/wmf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wmf/trunk/Makefile	2009-04-04 18:33:28 UTC (rev 4183)
+++ csw/mgar/pkg/wmf/trunk/Makefile	2009-04-04 18:34:36 UTC (rev 4184)
@@ -28,11 +28,13 @@
 UPSTREAM_USE_SF = 1
 UFILES_REGEX = (\d+(?:\.\d+)*)
 
-# If the url used to check for software update is different of MASTER_SITES, then 
-# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES
-# UPSTREAM_MASTER_SITES = 
-
 CONFIGURE_ARGS = $(DIRPATHS)
 
 TEST_TARGET = check
+
 include gar/category.mk
+
+post-configure-modulated:
+	@(echo "~~~ Fixing Libtool ~~~")
+	@$(FILEDIR)/fixme.sh $(WORKSRC)
+	$(DONADA)

Modified: csw/mgar/pkg/wmf/trunk/checksums
===================================================================
--- csw/mgar/pkg/wmf/trunk/checksums	2009-04-04 18:33:28 UTC (rev 4183)
+++ csw/mgar/pkg/wmf/trunk/checksums	2009-04-04 18:34:36 UTC (rev 4184)
@@ -1 +1,2 @@
 d1177739bf1ceb07f57421f0cee191e0  download/libwmf-0.2.8.4.tar.gz
+34f5b20f6caf282b2533784fbb1b4395  download/fixme.sh

Added: csw/mgar/pkg/wmf/trunk/files/fixme.sh
===================================================================
--- csw/mgar/pkg/wmf/trunk/files/fixme.sh	                        (rev 0)
+++ csw/mgar/pkg/wmf/trunk/files/fixme.sh	2009-04-04 18:34:36 UTC (rev 4184)
@@ -0,0 +1,51 @@
+#!/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')
+        gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >Makefile.new
+        gmv Makefile.new ${mk}
+        gchmod +x ${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}
+    gchmod +x ${lt}
+done
+
+for LTMAIN in $(gfind ${BASEPATH} -name ltmain.sh -print); do
+    gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new
+    gmv ${LTMAIN}.new ${LTMAIN}
+    gchmod +x ${LTMAIN}
+done
+


Property changes on: csw/mgar/pkg/wmf/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