From owner-svn-ports-all@freebsd.org Wed Jun 26 00:44:56 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7C45615DB308; Wed, 26 Jun 2019 00:44:56 +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 20F97854C5; Wed, 26 Jun 2019 00:44:56 +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 DDD1620298; Wed, 26 Jun 2019 00:44:55 +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 x5Q0itko053550; Wed, 26 Jun 2019 00:44:55 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x5Q0it4I053549; Wed, 26 Jun 2019 00:44:55 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201906260044.x5Q0it4I053549@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Wed, 26 Jun 2019 00:44:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r505129 - head/Mk/Scripts X-SVN-Group: ports-head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/Mk/Scripts X-SVN-Commit-Revision: 505129 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 20F97854C5 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.92 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.92)[-0.916,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] 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: Wed, 26 Jun 2019 00:44:56 -0000 Author: bdrewery Date: Wed Jun 26 00:44:55 2019 New Revision: 505129 URL: https://svnweb.freebsd.org/changeset/ports/505129 Log: Allow generate-symbols.sh to actually work. It splits out symbols to PREFIX as well not LOCALBASE. Fix check-stagedir.sh for that. 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 Tue Jun 25 21:41:54 2019 (r505128) +++ head/Mk/Scripts/check-stagedir.sh Wed Jun 26 00:44:55 2019 (r505129) @@ -95,14 +95,14 @@ setup_plist_seds() { unset PLIST_SUB_SED # Used for generate_plist sed_files_gen="${sed_portdocsexamples} /^share\/licenses/d; \ - \#${LOCALBASE}/lib/debug#d;" + \#${PREFIX}/lib/debug#d;" sed_dirs_gen="s,^,@dir ,; \ ${sed_portdocsexamples} \ /^@dir share\/licenses/d;" # These prevent ignoring DOCS/EXAMPLES dirs with sed_portdocsexamples sed_files="/^share\/licenses/d; \ - \#${LOCALBASE}/lib/debug#d;" + \#${PREFIX}/lib/debug#d;" sed_dirs="s,^,@dir ,; \ /^@dir share\/licenses/d;" Modified: head/Mk/Scripts/generate-symbols.sh ============================================================================== --- head/Mk/Scripts/generate-symbols.sh Tue Jun 25 21:41:54 2019 (r505128) +++ head/Mk/Scripts/generate-symbols.sh Wed Jun 26 00:44:55 2019 (r505129) @@ -17,7 +17,7 @@ find ${STAGEDIR} -type f \ > ${ELF_FILES} # Create all of the /usr/local/lib/* dirs -lib_dir="${STAGEDIR}.debug${PREFIX}/lib/debug" +lib_dir="${STAGEDIR}${PREFIX}/lib/debug" sed -e "s,^${STAGEDIR}${PREFIX}/,${lib_dir}/," -e 's,/[^/]*$,,' \ ${ELF_FILES} | sort -u | xargs mkdir -p @@ -27,13 +27,12 @@ while read -r staged_elf_file; do # Strip off filename lib_dir_dest="${lib_dir_dest%/*}" # Save symbols to f.debug - objcopy --only-keep-debug "${staged_elf_file}" \ - "${lib_dir_dest}/${elf_file_name}.debug" + debug_file_name="${lib_dir_dest}/${elf_file_name}.debug" + objcopy --only-keep-debug "${staged_elf_file}" "${debug_file_name}" # Strip and add a reference to f.debug for finding the symbols. objcopy --strip-debug --strip-unneeded \ - --add-gnu-debuglink="${lib_dir_dest}/${elf_file_name}.debug" \ - "${staged_elf_file}" + --add-gnu-debuglink="${debug_file_name}" "${staged_elf_file}" msg "Saved symbols for ${staged_elf_file}" -done < ${ELF_FILES} +done < ${ELF_FILES} 3>> ${TMPPLIST} rm -f ${ELF_FILES}