svn commit: r200564 - stable/7/release/picobsd/build

[Oliver Pinter]

On 12/15/09, Luigi Rizzo <luigi at freebsd.org> 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 at freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/svn-src-stable
> To unsubscribe, send any mail to "svn-src-stable-unsubscribe at freebsd.org"
>