Revision: 4809
http://gar.svn.sourceforge.net/gar/?rev=4809&view=rev
Author: idogan23
Date: 2009-05-11 11:58:07 +0000 (Mon, 11 May 2009)
Log Message:
-----------
rrdtool: changed libtool handling
Modified Paths:
--------------
csw/mgar/pkg/rrdtool/trunk/Makefile
Removed Paths:
-------------
csw/mgar/pkg/rrdtool/trunk/files/fixme.sh
Modified: csw/mgar/pkg/rrdtool/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rrdtool/trunk/Makefile 2009-05-11 11:47:36 UTC (rev 4808)
+++ csw/mgar/pkg/rrdtool/trunk/Makefile 2009-05-11 11:58:07 UTC (rev 4809)
@@ -12,7 +12,6 @@
MASTER_SITES = http://oss.oetiker.ch/$(GARNAME)/pub/
DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
DISTFILES += $(call admfiles,CSWrrdtool)
-DISTFILES += fixme.sh
# We define upstream file regex so we can be notifed of new upstream software
release
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
@@ -50,10 +49,7 @@
#BUILD64 = 1
-post-configure-$(MODULATION):
- @echo " ==> Fixing Libtool"
- @$(DOWNLOADDIR)/fixme.sh $(WORKSRC)
- $(DONADA)
+STRIP_LIBTOOL = 1
# ugly fix to fix doc path
post-install-modulated:
Deleted: csw/mgar/pkg/rrdtool/trunk/files/fixme.sh
===================================================================
--- csw/mgar/pkg/rrdtool/trunk/files/fixme.sh 2009-05-11 11:47:36 UTC (rev
4808)
+++ csw/mgar/pkg/rrdtool/trunk/files/fixme.sh 2009-05-11 11:58:07 UTC (rev
4809)
@@ -1,52 +0,0 @@
-#!/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
-
-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}
- gchmod +x ${LTMAIN}
-fi
-
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
