From 40d04c8ad56b8053cef0c466d5de28a31d9cbaef Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 15 Nov 2011 10:40:36 +0100 Subject: [PATCH] xbps-src: guess required shlibs by the same pkg automatically. --- xbps-src/common/mapping_shlib_binpkg.txt | 77 ------------------------ xbps-src/shutils/verify_rundeps.sh | 22 ++++--- 2 files changed, 14 insertions(+), 85 deletions(-) diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt index 37093f4754..9c81b78a6b 100644 --- a/xbps-src/common/mapping_shlib_binpkg.txt +++ b/xbps-src/common/mapping_shlib_binpkg.txt @@ -168,7 +168,6 @@ libbfd-2.21.so binutils binutils-devel libopcodes-2.21.so binutils binutils-devel libdb-4.8.so libdb db-devel libdb_cxx-4.8.so libdb db-devel -libperl.so perl libgdbm.so.3 gdbm gdbm-devel libgettextsrc-0.18.1.so gettext-libs gettext-devel libgettextlib-0.18.1.so gettext-libs gettext-devel @@ -198,7 +197,6 @@ libgirepository-everything-1.0.so libgirepository libgirepository-devel libgirepository-1.0.so.1 libgirepository libgirepository-devel libudev.so.0 libudev libudev-devel libgudev-1.0.so.0 libgudev libgudev-devel -libproc-3.2.8.so procps libext2fs.so.2 e2fsprogs-libs e2fsprogs-devel libcom_err.so.2 e2fsprogs-libs e2fsprogs-devel libe2p.so.2 e2fsprogs-libs e2fsprogs-devel @@ -335,9 +333,6 @@ libfreebl3.so nss nss-devel libnssdbm3.so nss nss-devel libnssckbi.so nss nss-devel libnss3.so nss nss-devel -libxul.so firefox -libxpcom.so firefox -libmozalloc.so firefox libxul.so xulrunner xulrunner-devel libmozjs.so xulrunner xulrunner-devel libdbusservice.so xulrunner xulrunner-devel @@ -426,42 +421,12 @@ libQtWebKit.so.4 qt qt-devel libQtDeclarative.so.4 qt qt-devel libQtDesignerComponents.so.4 qt-designer qt-devel libQtDesigner.so.4 qt-designer qt-devel -libvlc.so.5 vlc -libvlccore.so.4 vlc -libsylpheed-plugin-0.so.1 sylpheed -libsylph-0.so.1 sylpheed libsysfs.so.2 libsysfs libsysfs-devel libsensors.so.4 libsensors libsensors-devel -libxfce4sensors.so xfce4-sensors-plugin -libxpcom_core.so thunderbird -libgkgfx.so thunderbird -libgtkxtbin.so thunderbird -libthebes.so thunderbird -libssldap60.so thunderbird -libgfxpsshar.so thunderbird -libldap60.so thunderbird -libprldap60.so thunderbird -libldif60.so thunderbird libcap-ng.so.0 libcap-ng libcap-ng-devel libhandle.so.1 xfsprogs-libs xfsprogs-devel libphysfs.so.1 physfs physfs-devel libSDL_ttf-2.0.so.0 SDL_ttf SDL_ttf-devel -libpathplan.so.4 graphviz -libgvc.so.6 graphviz -libcgraph.so.6 graphviz -libxdot.so.4 graphviz -libgvpr.so.2 graphviz -libcdt.so.5 graphviz -libgraph.so.5 graphviz -libgvplugin_core.so.6 graphviz -libgvplugin_gdk_pixbuf.so.6 graphviz -libgvplugin_pango.so.6 graphviz -libgvplugin_xlib.so.6 graphviz -libgvplugin_neato_layout.so.6 graphviz -libgvplugin_dot_layout.so.6 graphviz -libgvplugin_gd.so.6 graphviz -libgvplugin_rsvg.so.6 graphviz -libgvplugin_gtk.so.6 graphviz libparted.so.0 libparted libparted-devel libopenobex.so.1 libopenobex libopenobex-devel libntfs-3g.so.81 ntfs-3g ntfs-3g-devel @@ -544,10 +509,6 @@ libroken.so.18 heimdal-libs heimdal-devel libsl.so heimdal-libs heimdal-devel libwind.so heimdal-libs heimdal-devel libmenu-cache.so.1 menu-cache menu-cache-devel -liblftp-jobs.so.0 lftp -liblftp-tasks.so.0 lftp -liblftp-network.so lftp -liblftp-pty.so lftp libupower-glib.so.1 upower upower-devel libdevkit-power-gobject.so upower upower-devel libgnomekbd.so.7 libgnomekbd libgnomekbd-devel @@ -646,13 +607,6 @@ libldap-2.4.so.2 libldap libldap-devel libldap_r-2.4.so.2 libldap libldap-devel libevent-2.0.so.5 libevent libevent-devel libSDL_mixer-1.2.so.0 SDL_mixer SDL_mixer-devel -libEnhancedDisassembly.so libllvm -libLLVM-2.9.so libllvm -libLLVMHello.so libllvm -libLTO.so libllvm -libprofile_rt.so libllvm -libBugpointPasses.so libllvm -libclang.so libclang libapr-1.so.0 apr apr-devel libaprutil-1.so.0 apr-util apr-util-devel libnetpgp.so.0 libnetpgp libnetpgp-devel @@ -681,9 +635,6 @@ libntfs.so.10 ntfsprogs ntfsprogs-devel libxml++-2.6.so libxml++ libxml++-devel libftgl.so.2 ftgl ftgl-devel libGLEW.so.1.6 glew glew-devel -liblightspark.so.0 lightspark -libman-2.6.0.2.so man-db -libmandb-2.6.0.2.so man-db libsndfile.so.1 libsndfile libsndfile-devel libspeex.so.1 libspeex speex-devel libspeexdsp.so.1 libspeex speex-devel @@ -733,16 +684,6 @@ libwavpack.so.1 libwavpack wavpack-devel libvala-0.14.so.0 libvala vala-devel libSDL_net-1.2.so.0 SDL_net SDL_net-devel libmodplug.so.1 libmodplug libmodplug-devel -VBoxVMM.so virtualbox-ose -VBoxRT.so virtualbox-ose -VBoxXPCOM.so virtualbox-ose -VBoxREM.so virtualbox-ose -VBoxDDU.so virtualbox-ose -VBoxDD2.so virtualbox-ose -VBoxOGLhostcrutil.so virtualbox-ose -VBoxKeyboard.so virtualbox-ose -VBoxOGLrenderspu.so virtualbox-ose -VBoxOGLcrutil.so virtualbox-ose-guest libfetch.so libfetch libfetch-devel libneon.so.27 neon neon-devel libsvn_subr-1.so.0 libsvn subversion-devel @@ -806,7 +747,6 @@ libclutter-gtk-1.0.so.0 clutter-gtk clutter-gtk-devel libchamplain-0.12.so.0 libchamplain libchamplain-devel libchamplain-gtk-0.12.so.0 libchamplain libchamplain-devel libgeoclue.so.0 geoclue geoclue-devel -libgnome-shell.so gnome-shell libvpx.so.0 libvpx libvpx-devel libXevie.so.1 libXevie libXevie-devel libatspi.so.0 at-spi2-core at-spi2-core-devel @@ -824,8 +764,6 @@ libgc.so.1 gc gc-devel libgslcblas.so.0 gsl gsl-devel libgsl.so.0 gsl gsl-devel liblua.so.5 lua lua-devel -libobrender.so.21 openbox -libobparser.so.21 openbox libburn.so.4 libburn libburn-devel libgdkmm-2.4.so.1 gtkmm2 gtkmm2-devel libgtkmm-2.4.so.1 gtkmm2 gtkmm2-devel @@ -884,22 +822,9 @@ libtracker-data.so.0 libtracker tracker-devel libtracker-extract-0.12.so.0 libtracker tracker-devel libtracker-miner-0.12.so.0 libtracker tracker-devel libtracker-sparql-0.12.so.0 libtracker tracker-devel -libmex-0.2.so.0 mex -libsystemd-daemon.so.0 systemd -libsystemd-login.so.0 systemd libply.so.2 libplymouth plymouth-devel libply-splash-graphics.so.2 libplymouth plymouth-devel libply-splash-core.so.2 libplymouth plymouth-devel -libJdbcOdbc.so jre -libjli.so jre -libjvm.so jre -libawt.so jre -libjava.so jre -libnet.so jre -libnio.so jre -libmawt.so jre -libverify.so jre -libfontmanager.so jre libfm.so.1 libfm libfm-devel libfm-gtk.so.1 libfm libfm-devel libunique-1.0.so.0 libunique1 libunique1-devel @@ -917,7 +842,6 @@ libt1.so.5 libt1 t1lib-devel libt1x.so.5 libt1 t1lib-devel libevdocument3.so.3 libevince evince-devel libevview3.so.3 libevince evince-devel -libgdprivate-1.0.so.0 gnome-documents libjack.so.0 libjack jack-devel libjackserver.so.0 libjack jack-devel libfftw3_threads.so.3 libfftw fftw-devel @@ -998,4 +922,3 @@ libxdg-basedir.so.1 libxdg-basedir libxdg-basedir-devel libev.so.4 libev libev-devel libgvnc-1.0.so.0 gtk-vnc gtk-vnc-devel libgtk-vnc-2.0.so.0 gtk-vnc gtk-vnc-devel -libvnc.so vinagre diff --git a/xbps-src/shutils/verify_rundeps.sh b/xbps-src/shutils/verify_rundeps.sh index ee2eb8af8e..1565dcd7ab 100644 --- a/xbps-src/shutils/verify_rundeps.sh +++ b/xbps-src/shutils/verify_rundeps.sh @@ -104,8 +104,20 @@ verify_rundeps() rdep="$(grep "$f" $maplib|awk '{print $2}')" rdepcnt="$(grep "$f" $maplib|awk '{print $2}'|wc -l)" if [ -z "$rdep" ]; then - echo " SONAME: $f <-> UNKNOWN PKG PLEASE FIX!" - broken=1 + # Ignore libs by current pkg + for j in ${verify_deps}; do + [ "$j" != "$f" ] && continue + found=1 + break + done + if [ -n "$found" ]; then + echo " SONAME: $f <-> $pkgname (ignored)" + unset found + continue + else + echo " SONAME: $f <-> UNKNOWN PKG PLEASE FIX!" + broken=1 + fi fi # Check if shlib is provided by multiple pkgs. if [ "$rdepcnt" -gt 1 ]; then @@ -115,12 +127,6 @@ verify_rundeps() else _rdep=$rdep fi - # Ignore libs by current pkg - if [ "${_rdep}" = "$pkgname" ]; then - echo " SONAME: $f <-> ${_rdep} (ignored)" - continue - fi - # Add required shlib to rundeps. echo " SONAME: $f <-> ${_rdep}" if [ -z "$soname_list" ]; then