Browse Source

Fix for 64-bit systems

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@50758 15284696-431f-4ddb-bdfa-cd5b030d7da7
Glynn Clements 13 years ago
parent
commit
d980190a5d
1 changed files with 12 additions and 12 deletions
  1. 12 12
      tools/sql.sh

+ 12 - 12
tools/sql.sh

@@ -103,8 +103,8 @@ cd $builddir
 
 ( cd dist.*
 
-LD_LIBRARY_PATH=`pwd`/lib
-export LD_LIBRARY_PATH
+#LD_LIBRARY_PATH=`pwd`/lib
+#export LD_LIBRARY_PATH
 
 find . -type f -perm +111 \! -name '*.so.*' \
 	| while read file ; do ldd $file | sed 's!^!'$file'!' ; done 2>/dev/null \
@@ -115,14 +115,14 @@ find . -type f -perm +111 \! -name '*.so.*' \
 
 find . -type f -perm +111 \! -name '*.so' \
 	| xargs nm -AD 2>/dev/null \
-	| egrep ': {8} U ' \
+	| egrep ': {8}{1,2} U ' \
 	| sed -e 's/:/ /g' -e 's/\.\///' \
 	| awk -vOFS='\t' '{print $1,$3}' \
 	> "$tmpdir/prog_imp.lst"
 
 find . -type f -perm +111 \! -name '*.so' \
 	| xargs nm -AD 2>/dev/null \
-	| egrep ':[0-9a-f]{8} [BCDGRSTW] ' \
+	| egrep ':[0-9a-f]{8}{1,2} [BCDGRSTW] ' \
 	| sed -e 's/:/ /g' -e 's/\.\///' \
 	| awk -vOFS='\t' '{print $1,$4}' \
 	> "$tmpdir/prog_exp.lst"
@@ -131,42 +131,42 @@ find . -type f -perm +111 \! -name '*.so' \
 
 find * -type f -name 'lib?*.a' \
 	| xargs nm -A \
-	| egrep ':[0-9a-f]{8} [BCDGRSTW] ' \
+	| egrep ':[0-9a-f]{8}{1,2} [BCDGRSTW] ' \
 	| sed 's/:/ /g' \
 	| awk -vOFS='\t' '{print gensub("^[^ ]*/","",1,$1),$2,$5}' \
 	> "$tmpdir/stlib_exp.lst"
 
 find * -type f -name 'lib?*.so' \
 	| xargs nm -AD \
-	| egrep ':[0-9a-f]{8} [BCDGRSTW] ' \
+	| egrep ':[0-9a-f]{8}{1,2} [BCDGRSTW] ' \
 	| sed 's/:/ /g' \
 	| awk -vOFS='\t' '{print gensub("^[^ ]*/","",1,$1),$4}' \
 	> "$tmpdir/shlib_exp.lst"
 
 find * -type f -name '*.o' \
 	| xargs nm -A \
-	| egrep ':[0-9a-f]{8} [BCDGRSTW] ' \
+	| egrep ':[0-9a-f]{8}{1,2} [BCDGRSTW] ' \
 	| sed 's/:/ /g' \
 	| awk -vOFS='\t' '{print $1,$4}' \
 	> "$tmpdir/obj_exp.lst"
 
 find * -type f -name 'lib?*.a' \
 	| xargs nm -A \
-	| egrep ': {8} U ' \
+	| egrep ': {8}{1,2} U ' \
 	| sed 's/:/ /g' \
 	| awk -vOFS='\t' '{print gensub("^[^ ]*/","",1,$1),$2,$4}' \
 	> "$tmpdir/stlib_imp.lst"
 
 find * -type f -name 'lib?*.so' \
 	| xargs nm -AD \
-	| egrep ': {8} U ' \
+	| egrep ': {8}{1,2} U ' \
 	| sed 's/:/ /g' \
 	| awk -vOFS='\t' '{print gensub("^[^ ]*/","",1,$1),$3}' \
 	> "$tmpdir/shlib_imp.lst"
 
 find * -type f -name '*.o' \
 	| xargs nm -A \
-	| egrep ': {8} U ' \
+	| egrep ': {8}{1,2} U ' \
 	| sed 's/:/ /g' \
 	| awk -vOFS='\t' '{print $1,$3}' \
 	> "$tmpdir/obj_imp.lst"
@@ -174,7 +174,7 @@ find * -type f -name '*.o' \
 libs=`awk '{print $3}' "$tmpdir/ldd.lst" | uniq | sort | uniq`
 
 nm -AD $libs \
-	| egrep ':[0-9a-f]{8} [TWDRC] ' \
+	| egrep ':[0-9a-f]{8}{1,2} [TWDRC] ' \
 	| sed 's/:/ /g' \
 	| awk -vOFS='\t' '{print gensub("^[^ ]*/","",1,$1),$4}' \
 	> "$tmpdir/libs.lst"
@@ -351,7 +351,7 @@ CREATE TABLE libs (
 
 CREATE TABLE ldd (
 	program VARCHAR(80) NOT NULL,
-	library VARCHAR(80) NOT NULL,
+	library VARCHAR(256) NOT NULL,
 	path VARCHAR(256)
 	) ;