[csw-devel] SF.net SVN: gar:[14698] csw/mgar/pkg/subversion/trunk
rthurner at users.sourceforge.net
rthurner at users.sourceforge.net
Thu Jun 2 22:27:58 CEST 2011
Revision: 14698
http://gar.svn.sourceforge.net/gar/?rev=14698&view=rev
Author: rthurner
Date: 2011-06-02 20:27:58 +0000 (Thu, 02 Jun 2011)
Log Message:
-----------
svn: remove fixme.sh as nobody seems to remember what it actually does
Modified Paths:
--------------
csw/mgar/pkg/subversion/trunk/Makefile
Removed Paths:
-------------
csw/mgar/pkg/subversion/trunk/files/fixme.sh
Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile 2011-06-02 18:49:36 UTC (rev 14697)
+++ csw/mgar/pkg/subversion/trunk/Makefile 2011-06-02 20:27:58 UTC (rev 14698)
@@ -168,7 +168,6 @@
DISTFILES += CSWsvn.checkinstall
DISTFILES += CSWap2svn.postinstall CSWap2svn.preremove
DISTFILES += httpd-svn.conf.CSW svn_access.conf.CSW
-DISTFILES += fixme.sh
# Fix: Add java headers for nested classes
# https://lists.ubuntu.com/archives/ubuntu-devel-discuss/2008-June/004633.html
@@ -249,8 +248,6 @@
# are then used in the "svn-ruby" target.
# See http://lists.opencsw.org/pipermail/maintainers/2009-May/002325.html
post-configure-modulated:
- @echo "~~~ Fixing Libtool ~~~"
- $(DOWNLOADDIR)/fixme.sh $(WORKSRC)
@echo "~~~ Creating GCC Makefile and libtool for ruby ~~~"
gcp $(WORKSRC)/Makefile $(WORKSRC)/Makefile.gcc
Deleted: csw/mgar/pkg/subversion/trunk/files/fixme.sh
===================================================================
--- csw/mgar/pkg/subversion/trunk/files/fixme.sh 2011-06-02 18:49:36 UTC (rev 14697)
+++ csw/mgar/pkg/subversion/trunk/files/fixme.sh 2011-06-02 20:27:58 UTC (rev 14698)
@@ -1,49 +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}
- 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
-
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