From owner-svn-ports-all@freebsd.org Thu Nov 7 20:49:18 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5D6A417869C; Thu, 7 Nov 2019 20:49:18 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 478FrG1pRHz4JvS; Thu, 7 Nov 2019 20:49:18 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 21B4E1B883; Thu, 7 Nov 2019 20:49:18 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xA7KnI8i072436; Thu, 7 Nov 2019 20:49:18 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xA7KnHss072434; Thu, 7 Nov 2019 20:49:17 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201911072049.xA7KnHss072434@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Thu, 7 Nov 2019 20:49:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r517011 - head/Mk/Scripts X-SVN-Group: ports-head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/Mk/Scripts X-SVN-Commit-Revision: 517011 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Nov 2019 20:49:18 -0000 Author: bdrewery Date: Thu Nov 7 20:49:17 2019 New Revision: 517011 URL: https://svnweb.freebsd.org/changeset/ports/517011 Log: generate-symbols: Need @dir entries if PREFIX!=LOCALBASE. - makeplist/check-plist: Don't suggest or complain about @dir entries for debug symbols added by this script. Same as is done for the debug symbols themselves. Sponsored by: DellEMC Modified: head/Mk/Scripts/check-stagedir.sh head/Mk/Scripts/generate-symbols.sh Modified: head/Mk/Scripts/check-stagedir.sh ============================================================================== --- head/Mk/Scripts/check-stagedir.sh Thu Nov 7 20:29:42 2019 (r517010) +++ head/Mk/Scripts/check-stagedir.sh Thu Nov 7 20:49:17 2019 (r517011) @@ -98,13 +98,15 @@ setup_plist_seds() { \#${LOCALBASE}/lib/debug#d;" sed_dirs_gen="s,^,@dir ,; \ ${sed_portdocsexamples} \ - /^@dir share\/licenses/d;" + /^@dir share\/licenses/d; \ + \#@dir ${LOCALBASE}/lib/debug#d;" # These prevent ignoring DOCS/EXAMPLES dirs with sed_portdocsexamples sed_files="/^share\/licenses/d; \ \#${LOCALBASE}/lib/debug#d;" sed_dirs="s,^,@dir ,; \ - /^@dir share\/licenses/d;" + /^@dir share\/licenses/d; \ + \#@dir ${LOCALBASE}/lib/debug#d;" } Modified: head/Mk/Scripts/generate-symbols.sh ============================================================================== --- head/Mk/Scripts/generate-symbols.sh Thu Nov 7 20:29:42 2019 (r517010) +++ head/Mk/Scripts/generate-symbols.sh Thu Nov 7 20:49:17 2019 (r517011) @@ -6,7 +6,7 @@ # the symbols to LOCALBASE/lib/debug/. # For example: # /var/qmail/bin/qmaild -> /usr/local/lib/debug/var/qmail/bin/qmaild.debug -# /usr/local/bin/ssh -> /usr/local/lib/debug/usr/local/bin/ssh +# /usr/local/bin/ssh -> /usr/local/lib/debug/usr/local/bin/ssh.debug LIB_DIR_PREFIX="${LOCALBASE}/lib/debug" msg() { @@ -42,5 +42,12 @@ while read -r staged_elf_file; do msg "Saved symbols for ${staged_elf_file}" echo "${debug_file_name#${STAGEDIR}}" >&3 done < ${ELF_FILES} 3>> ${TMPPLIST} + +# Need @dir entries if PREFIX != LOCALBASE +if [ "${PREFIX}" != "${LOCALBASE}" ] && [ -d "${lib_dir}" ]; then + find -sd "${lib_dir}" -type d | sed -e "s,^${STAGEDIR},," \ + -e 's,^,@dir ,' \ + >> ${TMPPLIST} +fi rm -f ${ELF_FILES}