From owner-svn-src-all@FreeBSD.ORG Tue Dec 15 10:49:59 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 389A61065670; Tue, 15 Dec 2009 10:49:59 +0000 (UTC) (envelope-from oliver.pntr@gmail.com) Received: from fg-out-1718.google.com (fg-out-1718.google.com [72.14.220.155]) by mx1.freebsd.org (Postfix) with ESMTP id 1EDC18FC28; Tue, 15 Dec 2009 10:49:57 +0000 (UTC) Received: by fg-out-1718.google.com with SMTP id 16so304960fgg.13 for ; Tue, 15 Dec 2009 02:49:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:cc:content-type; bh=wES1hhaFpER+V5OROC9CejtExnuroyx0jmi0SOV48BY=; b=GNxd7RyIGu7AZh+W/cetcrerOATdN+ikMcUKhvLfTS43NiWdmqDRaLzYG/IFGwYhBf 9HrQxGYLlKlye/jTKwH8xI4iPpWqJnVYX4xteMiXNPhN/gETxN6J8Dxuuqtae0EX/JQr VBzlg34YwjKUlK+TmwSP1UaaY3v9gS/cFOx0A= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; b=k10WXhcibDKedfDOiWye8yCCIUHXu1gVpzPmMhyeUB5k0hrY76BX1jUR91IMbjfu5R Vwu3FYm5NlLppamZzOnn1e9rERlWc6aPP7N3r1AOj3YnC9atRTfdco1v4AAR+ZH5J+4d LWGZT6X383rZNiNAEYO7fOLjAmFkyzlDpOUsk= MIME-Version: 1.0 Received: by 10.102.183.10 with SMTP id g10mr2726345muf.78.1260874196890; Tue, 15 Dec 2009 02:49:56 -0800 (PST) In-Reply-To: <200912150704.nBF74KUv053538@svn.freebsd.org> References: <200912150704.nBF74KUv053538@svn.freebsd.org> Date: Tue, 15 Dec 2009 10:49:56 +0000 Message-ID: <6101e8c40912150249x7ddbf920r21e2232f0b9b471@mail.gmail.com> From: Oliver Pinter To: Luigi Rizzo Content-Type: text/plain; charset=ISO-8859-1 Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-7@freebsd.org Subject: Re: svn commit: r200564 - stable/7/release/picobsd/build X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Dec 2009 10:49:59 -0000 On 12/15/09, Luigi Rizzo wrote: > Author: luigi > Date: Tue Dec 15 07:04:20 2009 > New Revision: 200564 > URL: http://svn.freebsd.org/changeset/base/200564 > > Log: > MFC r200301 > when calling ldd, use the cross libraries and not the host version > > Modified: > stable/7/release/picobsd/build/picobsd > > Modified: stable/7/release/picobsd/build/picobsd > ============================================================================== > --- stable/7/release/picobsd/build/picobsd Tue Dec 15 05:14:39 > 2009 (r200563) > +++ stable/7/release/picobsd/build/picobsd Tue Dec 15 07:04:20 > 2009 (r200564) > @@ -167,7 +167,7 @@ create_includes_and_libraries2() { # opt > local no > log "create_includes_and_libraries2() for ${SRC}" > if [ ${OSVERSION} -ge 600000 ] ; then > - no="-DNO_CLEAN -DNO_PROFILE -DNO_GAMES -DNO_LIBC_R" > + no="-DNO_CLEAN -DNO_PROFILE -DNO_GAMES -DNO_LIBC_R" # WITOUT_CDDL=1" is this not WITHOUT_CDDL with H ? > else > no="-DNOCLEAN -DNOPROFILE -DNOGAMES -DNOLIBC_R" > fi > @@ -587,8 +587,9 @@ find_progs() { # programs > local i > u_progs="`find_progs_helper $*`" > local o=${o_objdir:-${_SHLIBDIRPREFIX}} > + log "looking for libs for $u_progs in $_SHLIBDIRPREFIX" > [ -z "${u_progs}" ] && return 1 # not found, error > - i="`ldd ${u_progs} | grep -v '^/' | awk '{print $1}' | sort | uniq`" > + i="`LD_LIBRARY_PATH=$o/lib ldd ${u_progs} | grep -v '^/' | awk '{print > $1}' | sort | uniq`" > u_libs="`find_progs_helper $i`" > return 0 > } > @@ -719,8 +720,7 @@ populate_mfs_tree() { > (cd ${dst}; chown -R root . ) > fi > > - # If we are building a shared 'crunch', take the libraries > - # and the dynamic loader as well > + log "for a shared 'crunch' take libraries and dynamic loader as well" > find_progs ${dst}/stand/crunch > if [ -n "${u_libs}" ] ; then > mkdir -p ${dst}/lib && cp -p ${u_libs} ${dst}/lib > _______________________________________________ > svn-src-stable@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/svn-src-stable > To unsubscribe, send any mail to "svn-src-stable-unsubscribe@freebsd.org" >