From 5725a2e0ae062ab2f67f2f6e1cfbd4802110cde3 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 5 Feb 2015 11:37:10 +0100 Subject: [PATCH] xbps-src: introduce "noshlibprovides" to skip shlib-provides detection. --- Manual.md | 3 +++ common/environment/setup-subpkg/subpkg.sh | 7 +++++-- common/hooks/pre-pkg/06-shlib-provides.sh | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Manual.md b/Manual.md index b92dd6ade19..8796117d782 100644 --- a/Manual.md +++ b/Manual.md @@ -412,6 +412,9 @@ by all supported architectures. - `nostrip` If set, the ELF binaries with debugging symbols won't be stripped. By default all binaries are stripped. +- `noshlibprovides` If set, the ELF binaries won't be inspected to collect the provided +sonames in shared libraries. + - `nocross` If set, cross compilation won't be allowed and will exit immediately. - `python_versions` A white space seperated list of python versions which will diff --git a/common/environment/setup-subpkg/subpkg.sh b/common/environment/setup-subpkg/subpkg.sh index cc7af9bd202..22ecd6be352 100644 --- a/common/environment/setup-subpkg/subpkg.sh +++ b/common/environment/setup-subpkg/subpkg.sh @@ -8,12 +8,15 @@ unset -v depends run_depends replaces provides conflicts tags # hooks/post-install/03-strip-and-debug-pkgs unset -v nostrip nostrip_files shlib_requires -# hooks/post-install/04-generate-runtime-deps +# hooks/re-pkg/04-generate-runtime-deps unset -v noverifyrdeps allow_unknown_shlibs shlib_provides -# hooks/post-install/06-prepare-32bit +# hooks/pre-pkg/06-prepare-32bit unset -v lib32depends lib32disabled lib32files lib32mode lib32symlinks +# hooks/pre-pkg/06-shlib-provides +unset -v noshlibprovides + # xbps-triggers: system-accounts unset -v system_accounts system_groups diff --git a/common/hooks/pre-pkg/06-shlib-provides.sh b/common/hooks/pre-pkg/06-shlib-provides.sh index e29c676f2a9..15a4194fa46 100644 --- a/common/hooks/pre-pkg/06-shlib-provides.sh +++ b/common/hooks/pre-pkg/06-shlib-provides.sh @@ -43,7 +43,7 @@ collect_sonames() { hook() { local _destdir32=${XBPS_DESTDIR}/${pkgname}-32bit-${version} - if [ -n "$noarch" ]; then + if [ -n "$noarch" -o -n "$noshlibprovides" ]; then return 0 fi