Date: Mon, 18 Jan 2016 16:16:39 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r406593 - head/Mk/Scripts Message-ID: <201601181616.u0IGGdTK016946@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Mon Jan 18 16:16:39 2016 New Revision: 406593 URL: https://svnweb.freebsd.org/changeset/ports/406593 Log: Rework the logic of the libperl detection, making it a bit more simple, and also a bit more verbose. With hat: perl Sponsored by: Absolight Modified: head/Mk/Scripts/qa.sh Modified: head/Mk/Scripts/qa.sh ============================================================================== --- head/Mk/Scripts/qa.sh Mon Jan 18 16:04:22 2016 (r406592) +++ head/Mk/Scripts/qa.sh Mon Jan 18 16:16:39 2016 (r406593) @@ -251,26 +251,24 @@ libperl() { /RUNPATH.*perl.*CORE/ { runpath = 0 } END {print libperl+rpath+runpath} "` - # FIXME When 8.4 goes out of commission, replace the ;; - # with ;& in the case below. Also, change the logic on - # detecting if there was a file with libperl.so - if [ "$found" -ne "0" ]; then - case "$found" in - *1) - warn "${f} is not linked with ${LIBPERL}, not respecting lddlflags?" - ;; #;& - *1?) - has_some_libperl_so=1 - warn "${f} does not have a rpath to ${LIBPERL}, not respecting lddlflags?" - ;; #;& - 1??) - has_some_libperl_so=1 - warn "${f} does not have a runpath to ${LIBPERL}, not respecting lddlflags?" - ;; #;& - esac - else - has_some_libperl_so=1 - fi + case "${found}" in + *1) + warn "${f} is not linked with ${LIBPERL}, not respecting lddlflags?" + ;; + *0) + has_some_libperl_so=1 + case "${found}" in + *1?) + warn "${f} does not have a rpath to ${LIBPERL}, not respecting lddlflags?" + ;; + esac + case "${found}" in + 1??) + warn "${f} does not have a runpath to ${LIBPERL}, not respecting lddlflags?" + ;; + esac + ;; + esac # Use heredoc to avoid losing rc from find|while subshell done <<-EOT $(find ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL} -name '*.so')
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601181616.u0IGGdTK016946>