aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnssi Hannula <anssi@mandriva.org>2007-09-10 11:29:31 +0000
committerAnssi Hannula <anssi@mandriva.org>2007-09-10 11:29:31 +0000
commit610644bb42e877e4bb4528e87d1986e1ba2fe5e3 (patch)
tree98aafd9211244f6b3eac2a103cb4ec92dd5d8e99
parent19fa30c27fa1424b3f4bc937ed57c159fbd5745f (diff)
Ignore library dependencies of objects in /usr/lib(64)/gcj/, which are GCJ
AOT compiled shared objects and are only useful when running the software in the package with gij (gcc java). If the user uses some other java VM, they do not need their dependencies satisfied.
-rwxr-xr-xfind-provides.in2
-rwxr-xr-xfind-requires.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/find-provides.in b/find-provides.in
index d45d44a..e6646da 100755
--- a/find-provides.in
+++ b/find-provides.in
@@ -5,7 +5,7 @@
filelist=`sed "s/['\"]/\\\&/g"`
-solist=$(echo "$filelist" | grep -v "^/lib/ld\.so" | egrep '(/usr(/X11R6)?)?/lib(64)?/.*\.so' | \
+solist=$(echo "$filelist" | egrep -v "^/lib/ld\.so|/usr/lib(64)?/gcj/" | egrep '(/usr(/X11R6)?)?/lib(64)?/.*\.so' | \
xargs file -L 2>/dev/null | grep "ELF.*shared object" | cut -d: -f1)
pythonlist=
tcllist=
diff --git a/find-requires.in b/find-requires.in
index ec2f6a3..0baceea 100755
--- a/find-requires.in
+++ b/find-requires.in
@@ -44,7 +44,7 @@ exelist=`echo "$filelist" | xargs -r file | egrep -v ":.* (commands|script) " |
grep ":.*executable" | cut -d: -f1`
scriptlist=`echo "$filelist" | grep -v /usr/doc | grep -v /usr/share/doc | xargs -r file | \
egrep ":.* (commands|script) " | cut -d: -f1`
-liblist=`echo "$filelist" | xargs -r file | \
+liblist=`echo "$filelist" | egrep -v "/usr/lib(64?)/gcj/" | xargs -r file | \
grep ":.*shared object" | cut -d : -f1`
ocamllist=`echo "$filelist" | xargs -r file | \
grep ":.*Objective caml interface file" | cut -d : -f1`