Revision: 4910
http://gar.svn.sourceforge.net/gar/?rev=4910&view=rev
Author: valholla
Date: 2009-05-17 04:43:28 +0000 (Sun, 17 May 2009)
Log Message:
-----------
fix bug in fixlibtool, the script was not pulling the libdir from the psuedo
library
Modified Paths:
--------------
csw/mgar/gar/v2/bin/fixlibtool
Modified: csw/mgar/gar/v2/bin/fixlibtool
===================================================================
--- csw/mgar/gar/v2/bin/fixlibtool 2009-05-17 02:53:34 UTC (rev 4909)
+++ csw/mgar/gar/v2/bin/fixlibtool 2009-05-17 04:43:28 UTC (rev 4910)
@@ -1,4 +1,5 @@
#!/bin/bash
+#set -x
####################################################
#
# $URL$
@@ -33,9 +34,8 @@
## Fix Makefiles
for mk in $(gfind ${BASEPATH} -name Makefile -print); do
gcp ${mk} ${mk}.orig
- LT_FILES=$(ggrep '/opt/csw.*/lib/.*\.la' ${mk} | \
- gsed "s/^.*\(\/opt\/csw.*\/lib\/.*\.la\).*$/\1/")
-
+ LT_FILES=$(for lib in $(ggrep '/opt/csw.*/lib/.*\.la' ${mk}); do \
+ echo $lib |gsed -ne '/\/opt.*\.la/p'; done)
for file in ${LT_FILES}; do
LIB_NAME=$(ggrep 'dlname=' ${file} | \
gsed -e "s/.*'\(.*\)'/\1/" \
@@ -43,7 +43,8 @@
-e "s/\.so.*$//")
fixpath=$(gecho $file |gsed 's/\//\\\//g')
gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >${mk}.new
- gmv ${mk}.new ${mk}
+ LIB_DIR=$(ggrep 'libdir=' ${file} | gsed -e "s/.*'\(.*\)'/\1/")
+ gsed "s,\(LDFLAGS =.*\),\1 -R${LIB_DIR} -L${LIB_DIR}," ${mk}.new >${mk}
gchmod +x ${mk}
done
done
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
