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 C8C2F1381F3 for ; Fri, 28 Jun 2013 13:36:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B1E23E095A; Fri, 28 Jun 2013 13:36:40 +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 36C54E095A for ; Fri, 28 Jun 2013 13:36:39 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EC3D333E76A for ; Fri, 28 Jun 2013 13:36:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 865ECE468F for ; Fri, 28 Jun 2013 13:36:37 +0000 (UTC) From: "Yuta SATOH" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Yuta SATOH" Message-ID: <1372426580.141e2703ef84b251a02c99e022745b766ae2786e.yuta_satoh@gentoo> Subject: [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-lib/ X-VCS-Repository: proj/gentoo-bsd X-VCS-Files: sys-freebsd/freebsd-lib/Manifest sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild X-VCS-Directories: sys-freebsd/freebsd-lib/ X-VCS-Committer: yuta_satoh X-VCS-Committer-Name: Yuta SATOH X-VCS-Revision: 141e2703ef84b251a02c99e022745b766ae2786e X-VCS-Branch: master Date: Fri, 28 Jun 2013 13:36:37 +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: bab6eee7-8c6b-41af-ab3f-bce63a46226d X-Archives-Hash: fdcba4165aea78f721a8bd914c5dc38e commit: 141e2703ef84b251a02c99e022745b766ae2786e Author: Yuta SATOH gentoo gr jp> AuthorDate: Fri Jun 28 13:36:20 2013 +0000 Commit: Yuta SATOH 0x100 com> CommitDate: Fri Jun 28 13:36:20 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=141e2703 freebsd-lib-9.9999: sync to latest tree --- sys-freebsd/freebsd-lib/Manifest | 2 +- sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest index 5138ee2..7e4f25f 100644 --- a/sys-freebsd/freebsd-lib/Manifest +++ b/sys-freebsd/freebsd-lib/Manifest @@ -20,4 +20,4 @@ AUX freebsd-sources-9.0-sysctluint.patch 403 SHA256 884fbc5d6d3766ea3d4609946f56 AUX libmap.conf 201 SHA256 36a1bd56965f171cbb058f6e1762801e3b92c083fe36f6fe046bd669beed9742 SHA512 abc358dff495fe96b9ed549bacb5278577ca4da46b89b87e9211a2f6acdd455111df02ba11b797287f839af6cc22f8810e8ac1dc52154acc8b22364e667b3c49 WHIRLPOOL 0827a0ea9b8a2faed019d13356a793b2b572e54d6f8ebf32a9f12214759153433e21f7d8fdedf43e038ac1925432c1f4843441db47d29895eda51781f1fedb5e AUX libusb-1.0.pc.in 207 SHA256 edf35e887cbfed2df288825434c467e0a946eeb21e0d631f55940bb177c2ba15 SHA512 93289cecfc298a31fd4fd0848bf25a63048a7549bd81792d7bd158731246221c24ec9f469a918430da56873a0936fb2b372cedaaa32a38ccd5323de0f9a89b93 WHIRLPOOL 7c81b0df4548a9391b4e1420186f1e970aa9e2e73a89e817adbff9de52b8797cbd8a4d8b3ca01f782f86e4b1e48fad72a08b5bff49d5ee6ffaa5135c015ca5ae AUX libusb.pc.in 208 SHA256 9bfe398a335f8b9b1c3dd167ab0c9206fe3bdd4e1da318ece977e20f3c2d7c56 SHA512 e9c6d5f04057cf8c13f69a3d8e07bdd517fdb01d572a69a1beb397766311b3c53894b108caaaea740bfc27b227a9620621dac5846bff1a367fbf9954f38bb40c WHIRLPOOL e80e76a8a564655d924a7148a841c7c7cf0be0ea3bdbd76e95e5004124543826e5d925dfe791f4b040e042a10923865bb517499d9f5be39611fedbcceebe32d8 -EBUILD freebsd-lib-9.9999.ebuild 18247 SHA256 532de3d66f54a9a3895f239a853c4635af21ed3db10da0362acc1bc8426376aa SHA512 c8802ed5cf8b5d47e9e14dcff03655675eab7b5e54ba98bb79f9c3cfd365ae2f0256b1e0f03b6cb5133360344a0afae0168725ba78e71a4d58d6e65833b8e719 WHIRLPOOL b309f937ff605bbd1dbe27df2c3477bd4afef330f31e62edb6e66d090e28db48172bb49fd513779b0087927cbe8ec82dfc8d9a4e1fbb3b9ab66529454de4ecc9 +EBUILD freebsd-lib-9.9999.ebuild 18272 SHA256 68ab019ee848d792c85c088c9a425ff6950d3ea485a6c4074f38af91b80ee25f SHA512 a9ea0fcb13f92705bf007ee319f284066e5a5a7ba51aa2113d31ada4b9023ef72b50f9cb1d92c3a8aef74ad0afa0e69679ef9f92424a08dd5884a1fd20fb4be1 WHIRLPOOL 34177ca3c10f7abeb9268e9f8a6e8817709b88ef31ae4a9c4b9ea705acf3f10723aaeb6dfda068b8413e921c3d20ef3420bd6009e89bc849b707cc97ecd352d6 diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild index 1f34233..c20d09f 100644 --- a/sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild +++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild @@ -465,11 +465,18 @@ wrap_header_end() { } do_install() { - INCLUDEDIR="/usr/include" + if is_crosscompile ; then + INCLUDEDIR="/usr/${CTARGET}/usr/include" + else + INCLUDEDIR="/usr/include" + fi + dodir ${INCLUDEDIR} CTARGET="${CHOST}" \ install_includes ${INCLUDEDIR} + is_crosscompile && use crosscompile_opts_headers-only && return 0 + for i in $(get_subdirs) ; do einfo "Installing in ${i}..." cd "${WORKDIR}/${i}/" || die "missing ${i}." @@ -513,11 +520,9 @@ do_install() { src_install() { if is_crosscompile ; then einfo "Installing for ${CTARGET} in ${CHOST}.." - INCLUDEDIR="/usr/${CTARGET}/usr/include" - dodir ${INCLUDEDIR} - install_includes ${INCLUDEDIR} - - use crosscompile_opts_headers-only && return 0 + # From this point we need to force: get stripped with the correct tools, + # get tc-arch-kernel to return the right value, etc. + export CHOST=${CTARGET} mymakeopts="${mymakeopts} NO_MAN= \ INCLUDEDIR=/usr/${CTARGET}/usr/include \ @@ -527,9 +532,6 @@ src_install() { dosym "usr/include" "/usr/${CTARGET}/sys-include" do_install - # This is to get it stripped with the correct tools, otherwise it gets - # stripped with the host strip. - export CHOST=${CTARGET} return 0 else export STRIP_MASK="*/usr/lib*/*crt*.o"