From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 04EFF198005 for ; Mon, 11 Mar 2013 00:13:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A65C0E06BE; Mon, 11 Mar 2013 00:13:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3BC9FE06BE for ; Mon, 11 Mar 2013 00:13:19 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3D45A33BF5F for ; Mon, 11 Mar 2013 00:13:18 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 559) id 04C252171D; Mon, 11 Mar 2013 00:13:16 +0000 (UTC) From: "Mike Frysinger (vapier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, vapier@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: eutils.eclass X-VCS-Directories: eclass X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20130311001317.04C252171D@flycatcher.gentoo.org> Date: Mon, 11 Mar 2013 00:13:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e1f5af4e-f0ed-4cb6-9dbe-52205f543ca1 X-Archives-Hash: 7430bdf02103512b435fa999bafe45a9 vapier 13/03/11 00:13:16 Modified: eutils.eclass Log: make_wrapper: optimize output slightly in common cases by omitting dead code Revision Changes Path 1.414 eclass/eutils.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.414&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.414&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?r1=1.413&r2=1.414 Index: eutils.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v retrieving revision 1.413 retrieving revision 1.414 diff -u -r1.413 -r1.414 --- eutils.eclass 9 Mar 2013 18:18:09 -0000 1.413 +++ eutils.eclass 11 Mar 2013 00:13:16 -0000 1.414 @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.413 2013/03/09 18:18:09 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.414 2013/03/11 00:13:16 vapier Exp $ # @ECLASS: eutils.eclass # @MAINTAINER: @@ -1292,21 +1292,25 @@ make_wrapper() { local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 local tmpwrapper=$(emktemp) - # We don't want to quote ${bin} so that people can pass complex - # things as $bin ... "./someprog --args" - cat << EOF > "${tmpwrapper}" -#!/bin/sh -cd "${chdir:-.}" -if [ -n "${libdir}" ] ; then - if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then - export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" - else - export LD_LIBRARY_PATH="${libdir}" + + ( + echo '#!/bin/sh' + [[ -n ${chdir} ]] && printf 'cd "%s"\n' "${chdir}" + if [[ -n ${libdir} ]] ; then + cat <<-EOF + if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then + export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" + else + export LD_LIBRARY_PATH="${libdir}" + fi + EOF fi -fi -exec ${bin} "\$@" -EOF + # We don't want to quote ${bin} so that people can pass complex + # things as ${bin} ... "./someprog --args" + printf 'exec %s "$@"\n' "${bin}" + ) > "${tmpwrapper}" chmod go+rx "${tmpwrapper}" + if [[ -n ${path} ]] ; then ( exeinto "${path}"