Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 17 Dec 2018 14:29:41 +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: r487685 - head/Mk/Scripts
Message-ID:  <201812171429.wBHETfXP096140@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Mon Dec 17 14:29:41 2018
New Revision: 487685
URL: https://svnweb.freebsd.org/changeset/ports/487685

Log:
  Remove obsolete qa check.

Modified:
  head/Mk/Scripts/qa.sh   (contents, props changed)

Modified: head/Mk/Scripts/qa.sh
==============================================================================
--- head/Mk/Scripts/qa.sh	Mon Dec 17 14:10:41 2018	(r487684)
+++ head/Mk/Scripts/qa.sh	Mon Dec 17 14:29:41 2018	(r487685)
@@ -279,31 +279,16 @@ libperl() {
 			# No results presents a blank line from heredoc.
 			[ -z "${f}" ] && continue
 			files=$((files+1))
-			found=$(readelf -d ${f} | awk "BEGIN {libperl=1; rpath=10; runpath=100}
+			found=$(readelf -d ${f} | awk "BEGIN {libperl=1}
 				/NEEDED.*${LIBPERL}/  { libperl = 0 }
-				/RPATH.*perl.*CORE/   { rpath   = 0 }
-				/RUNPATH.*perl.*CORE/ { runpath = 0 }
-				END {print libperl+rpath+runpath}
+				END {print libperl}
 				")
 			case "${found}" in
-				*1)
+				1)
 					warn "${f} is not linked with ${LIBPERL}, not respecting lddlflags?"
 					;;
-				*0)
+				0)
 					has_some_libperl_so=1
-					# Older Perl did not USE_LDCONFIG.
-					if [ ! -f ${LOCALBASE}/${LDCONFIG_DIR}/perl5 ]; then
-						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
-					fi
 					;;
 			esac
 		# Use heredoc to avoid losing rc from find|while subshell
@@ -312,7 +297,7 @@ libperl() {
 		EOT
 
 		if [ ${files} -gt 0 -a ${has_some_libperl_so} -eq 0 ]; then
-			err "None of the .so in ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL} are linked with ${LIBPERL}, see above for the full list."
+			err "None of the ${files} .so in ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL} are linked with ${LIBPERL}, see above for the full list."
 			return 1
 		else
 			return 0



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812171429.wBHETfXP096140>