Re: [PATCH] Try to pull in generic libraries as well as optimized ones (#572178)

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On Thu, 25 Mar 2010, Peter Jones wrote:

Attempt to pull in generic libraries whenever we see a platform
optimized one.  This implementation uses the naive approach of just
chopping directories out of the middle of library paths and seeing if
there's a file there without that part.  If there is, it pulls that in
as well.

It seems to work to build power5-able trees on a power6 machine.
---
scripts/buildinstall.functions |    9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/scripts/buildinstall.functions b/scripts/buildinstall.functions
index b0dc8cd..5f5e258 100755
--- a/scripts/buildinstall.functions
+++ b/scripts/buildinstall.functions
@@ -41,6 +41,15 @@ get_dso_deps() {
        NAMES[$n]="$NAME"
        FILES[$n]="$FILE"
        let n++
+
+        # try to find a generic version
+        local basedir=$(dirname $(dirname "$FILE"))
+        local basefile=$(basename "$FILE")
+        if [ -f "$basedir/$basefile" ]; then
+            NAMES[$n]="$NAME"
+            FILES[$n]="$basedir/$basefile"
+            let n++
+        fi
    done << EOF
        $(/usr/sbin/chroot $root env LD_TRACE_PRELINKING=1 LD_WARN= \
                                     LD_TRACE_LOADED_OBJECTS=1 $LDSO $bin)


OK for master and rhel6-branch.

- -- David Cantrell <dcantrell@xxxxxxxxxx>
Red Hat / Honolulu, HI

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEARECAAYFAkurmGAACgkQ5hsjjIy1VkkQFgCgmweqYAvF8RBFgBsTuhKuocqw
G5sAni1pgemYdnrQBFpel/df4HFl+G4f
=57VQ
-----END PGP SIGNATURE-----

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux