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 C909A1388C0 for ; Sun, 28 Feb 2016 16:54:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B82DB21C001; Sun, 28 Feb 2016 16:54:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 67BC321C001 for ; Sun, 28 Feb 2016 16:54:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EAA08340B10 for ; Sun, 28 Feb 2016 16:54:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B255E16C4 for ; Sun, 28 Feb 2016 16:53:57 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1456678430.94616038c4dcdaaf7fc9af0e803dcfd1b8899811.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-freebsd/freebsd-lib/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild X-VCS-Directories: sys-freebsd/freebsd-lib/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: 94616038c4dcdaaf7fc9af0e803dcfd1b8899811 X-VCS-Branch: master Date: Sun, 28 Feb 2016 16:53:57 +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: c01c0933-a7da-49cd-82e0-5404a1d660ed X-Archives-Hash: ee214e2a5f0398a84c83e90d53e73c76 commit: 94616038c4dcdaaf7fc9af0e803dcfd1b8899811 Author: Alexis Ballier gentoo org> AuthorDate: Sun Feb 28 16:53:37 2016 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Sun Feb 28 16:53:50 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94616038 sys-freebsd/freebsd-lib: add DESTDIR support to gen_libc_ldscript function so that we can make the ldscript SYSROOT relative when building a cross compiler. Package-Manager: portage-2.2.27 Signed-off-by: Alexis Ballier gentoo.org> sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild index eb75ede..0ce19a2 100644 --- a/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild +++ b/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r2.ebuild @@ -405,11 +405,11 @@ gen_libc_ldscript() { # $3 = source libssp_nonshared dir # Clear the symlink. - rm -f "${D}/$2/libc.so" || die + rm -f "${DESTDIR}/$2/libc.so" || die # Move the library if needed if [ "$1" != "$2" ] ; then - mv "${D}/$2/libc.so.7" "${D}/$1/" || die + mv "${DESTDIR}/$2/libc.so.7" "${DESTDIR}/$1/" || die fi # Generate libc.so ldscript for inclusion of libssp_nonshared.a when linking @@ -423,7 +423,7 @@ gen_libc_ldscript() { # iconv symbol provided by libc_nonshared.a. # http://svnweb.freebsd.org/base?view=revision&revision=258283 - cat > "${D}/$2/libc.so" <<-END_LDSCRIPT + cat > "${DESTDIR}/$2/libc.so" <<-END_LDSCRIPT /* GNU ld script SSP (-fstack-protector) requires __stack_chk_fail_local to be local. GCC invokes this symbol in a non-PIC way, which results in TEXTRELs if @@ -528,13 +528,13 @@ do_install() { if ! is_crosscompile ; then if ! multilib_is_native_abi ; then - gen_libc_ldscript "usr/$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)" + DESTDIR="${D}" gen_libc_ldscript "usr/$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)" else dodir "$(get_libdir)" - gen_libc_ldscript "$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)" + DESTDIR="${D}" gen_libc_ldscript "$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)" fi else - CHOST=${CTARGET} gen_libc_ldscript "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib" + CHOST=${CTARGET} DESTDIR="${D}/usr/${CTARGET}/" gen_libc_ldscript "usr/lib" "usr/lib" "usr/lib" # We're done for the cross libc here. return 0 fi