diff options
| author |   Steven J Newbury <steve@snewbury.org.uk> | 2009-04-07 00:46:41 +0100 |
|---|---|---|
| committer | Steven J Newbury <steve@snewbury.org.uk> | 2009-04-07 00:46:41 +0100 |
| commit | 98b8b93c3094ab38acbfd7a93d0c6e5cb43e1ba4 (patch) | |
| tree | b6fb64e0ce6c9a90460cd6168815f9a0791d1e1f | |
| parent | Improve the detection of ${PN}-config files, hopefully it will catch (diff) | |
| download | multilib-portage-98b8b93c3094ab38acbfd7a93d0c6e5cb43e1ba4.tar.gz multilib-portage-98b8b93c3094ab38acbfd7a93d0c6e5cb43e1ba4.tar.bz2 multilib-portage-98b8b93c3094ab38acbfd7a93d0c6e5cb43e1ba4.zip | |
Revert "Improve the detection of ${PN}-config files, hopefully it will catch"
This reverts commit 8a8bc8cf8c9a161f9c58885d27f906a884ffc7f2.
| -rw-r--r-- | eclass/multilib-native.eclass | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/eclass/multilib-native.eclass b/eclass/multilib-native.eclass index 10a342764..2b9fd2c9e 100644 --- a/eclass/multilib-native.eclass +++ b/eclass/multilib-native.eclass @@ -323,15 +323,15 @@ multilib-native_src_generic_sub() { KDE_S="${EMULTILIB_OKDE_S}" mycmakeargs="${EMULTILIB_Omycmakeargs}" - # handle old-style (non-PKG-CONFIG) *-config* scripts + # handle old-style (non-PKG-CONFIG) *-config scripts if [[ ${1} == "src_install" ]] && \ - ! is_final_abi; then - local _config - for _config in $(find ${D}/usr/bin \ - -executable \ - -name '*${PN}-config*'); do - mv ${_config} ${_config}-${ABI} - done + ( [[ ${ABI} == "x86" ]] || [[ ${ABI} == "ppc32" ]] ); then + [[ -x "${D}/usr/bin/${PN}-config" ]] && \ + mv "${D}/usr/bin/${PN}-config" \ + "${D}/usr/bin/${PN}-config-${ABI}" + [[ -x "${D}/usr/bin/lib${PN}-config" ]] && \ + mv "${D}/usr/bin/lib${PN}-config" \ + "${D}/usr/bin/lib${PN}-config-${ABI}" fi fi fi |