diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2013-02-03 00:52:11 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2013-02-03 00:52:11 -0500 |
| commit | 5652fecb44e99221f446c6ac7088d4f0da53c623 (patch) | |
| tree | 7218109d482b5bc444d2dbc5f449398c1e22cf72 | |
| parent | Mask USE=test if RESTRICT=test, for bug #273272. (diff) | |
| download | portage-5652fecb44e99221f446c6ac7088d4f0da53c623.tar.gz portage-5652fecb44e99221f446c6ac7088d4f0da53c623.tar.bz2 portage-5652fecb44e99221f446c6ac7088d4f0da53c623.zip | |
install_qa_check: use #k rather than %k with scanelf
No need to use `sed` to remove the string when scanelf itself supports it.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| -rwxr-xr-x | bin/misc-functions.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index 5fd0eab2c..ddd917934 100755 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -191,8 +191,7 @@ install_qa_check() { [[ "${FFLAGS}" == *-frecord-gcc-switches* ]] && \ [[ "${FCFLAGS}" == *-frecord-gcc-switches* ]] ; then rm -f "${T}"/scanelf-ignored-CFLAGS.log - for x in $(scanelf -qyRF '%k %p' -k \!.GCC.command.line "${ED}" | \ - sed -e "s:\!.GCC.command.line ::") ; do + for x in $(scanelf -qyRF '#k%p' -k '!.GCC.command.line' "${ED}") ; do # Separate out file types that are known to support # .GCC.command.line sections, using the `file` command # similar to how prepstrip uses it. @@ -398,7 +397,7 @@ install_qa_check() { # Check for files built without respecting LDFLAGS if [[ "${LDFLAGS}" == *,--hash-style=gnu* ]] && \ ! has binchecks ${RESTRICT} ; then - f=$(scanelf -qyRF '%k %p' -k .hash "${ED}" | sed -e "s:\.hash ::") + f=$(scanelf -qyRF '#k%p' -k .hash "${ED}") if [[ -n ${f} ]] ; then echo "${f}" > "${T}"/scanelf-ignored-LDFLAGS.log if [ "${QA_STRICT_FLAGS_IGNORED-unset}" = unset ] ; then |