[csw-devel] SF.net SVN: gar:[3729] csw/mgar/pkg/pidgin/trunk

[harpchad at users.sourceforge.net]

Revision: 3729
          http://gar.svn.sourceforge.net/gar/?rev=3729&view=rev
Author:   harpchad
Date:     2009-03-12 15:36:40 +0000 (Thu, 12 Mar 2009)

Log Message:
-----------
Add fixme.sh to avoid libtool problems

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

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

Removed Paths:
-------------
    csw/mgar/pkg/pidgin/trunk/files/x11.pc

Modified: csw/mgar/pkg/pidgin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pidgin/trunk/Makefile	2009-03-12 15:10:12 UTC (rev 3728)
+++ csw/mgar/pkg/pidgin/trunk/Makefile	2009-03-12 15:36:40 UTC (rev 3729)
@@ -9,7 +9,7 @@
 
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += x11.pc
+DISTFILES += fixme.sh
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += '--with-dbus-services=/opt/csw/etc/dbus-1'
@@ -25,12 +25,11 @@
 MSGFMT=/opt/csw/bin/gmsgfmt
 MSGMERGE=/opt/csw/bin/gmsgmerge
 SED=/opt/csw/bin/gsed
-EXTRA_CONFIGURE_EXPORTS = DOT XGETTEXT MSGFMT MSGMERGE SED
+X11_CFLAGS=-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DXTHREADS -DXUSE_MTSAFE_API
+X11_LIBS=-lX11
+EXTRA_CONFIGURE_EXPORTS = DOT XGETTEXT MSGFMT MSGMERGE SED X11_CFLAGS X11_LIBS
 EXTRA_INC = /opt/csw/include/ncurses
 
-#Need to include our own x11.pc file as solaris 8 doesn't have one
-EXTRA_PKGCONFIG_PATH = $(CURDIR)/$(WORKDIR)
-
 TEST_TARGET = check
 
 # We define upstream file regex so we can be notifed of new upstream software release
@@ -45,5 +44,9 @@
 REQUIRED_PKGS_CSWpidgin += CSWpango CSWperl CSWpython CSWsilctoolkit CSWstartupnotif
 REQUIRED_PKGS_CSWpidgin += CSWtcl CSWtk CSWiconv CSWsunmath CSWzlib CSWdbus
 
+include gar/category.mk
 
-include gar/category.mk
+post-configure-$(MODULATION):
+	@(echo "~~~ Fixing Libtool ~~~")
+	@$(DOWNLOADDIR)/fixme.sh $(WORKSRC)
+	$(DONADA)

Modified: csw/mgar/pkg/pidgin/trunk/checksums
===================================================================
--- csw/mgar/pkg/pidgin/trunk/checksums	2009-03-12 15:10:12 UTC (rev 3728)
+++ csw/mgar/pkg/pidgin/trunk/checksums	2009-03-12 15:36:40 UTC (rev 3729)
@@ -1,2 +1,2 @@
 08d9c0c8dd43dbcec6f67d8ba596029f  download/pidgin-2.5.5.tar.gz
-715c7954371b53f6ca4083a011cadfe5  download/x11.pc
+41ec540885de7c34625768aa1fb9682b  download/fixme.sh

Added: csw/mgar/pkg/pidgin/trunk/files/fixme.sh
===================================================================
--- csw/mgar/pkg/pidgin/trunk/files/fixme.sh	                        (rev 0)
+++ csw/mgar/pkg/pidgin/trunk/files/fixme.sh	2009-03-12 15:36:40 UTC (rev 3729)
@@ -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')
+        gsed "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/pidgin/trunk/files/fixme.sh
___________________________________________________________________
Added: svn:executable
   + *

Deleted: csw/mgar/pkg/pidgin/trunk/files/x11.pc
===================================================================
--- csw/mgar/pkg/pidgin/trunk/files/x11.pc	2009-03-12 15:10:12 UTC (rev 3728)
+++ csw/mgar/pkg/pidgin/trunk/files/x11.pc	2009-03-12 15:36:40 UTC (rev 3729)
@@ -1,12 +0,0 @@
-prefix=/usr/openwin
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-xthreadlib=
-
-Name: X11
-Description: X Library
-Cflags: -I${includedir} -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DXTHREADS -DXUSE_MTSAFE_API
-Libs: -L${libdir} -R${libdir} -lX11
-Libs.private:


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