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 91A9C1381F3 for ; Sat, 31 Aug 2013 16:01:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 551DFE0FD0; Sat, 31 Aug 2013 16:01:06 +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 9C218E0FCE for ; Sat, 31 Aug 2013 16:01:05 +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 4907433EBCD for ; Sat, 31 Aug 2013 16:01:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E4E52E468F for ; Sat, 31 Aug 2013 16:01:02 +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: <1377964275.4649e728a49586456a5e19d1fc61cb180841ef57.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-9999_p255023.ebuild X-VCS-Directories: sys-freebsd/freebsd-lib/ X-VCS-Committer: yuta_satoh X-VCS-Committer-Name: Yuta SATOH X-VCS-Revision: 4649e728a49586456a5e19d1fc61cb180841ef57 X-VCS-Branch: master Date: Sat, 31 Aug 2013 16:01:02 +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: 68043f3e-16ca-4cfd-839e-15b1345c7e40 X-Archives-Hash: 0f2e8f3ec45a2aa4f7d85ce3f88ebc82 commit: 4649e728a49586456a5e19d1fc61cb180841ef57 Author: Yuta SATOH gentoo gr jp> AuthorDate: Sat Aug 31 15:51:15 2013 +0000 Commit: Yuta SATOH 0x100 com> CommitDate: Sat Aug 31 15:51:15 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=4649e728 freebsd-lib-9999_p255023: Correctly fix WITHOUT_ICONV= --- sys-freebsd/freebsd-lib/Manifest | 2 +- sys-freebsd/freebsd-lib/freebsd-lib-9999_p255023.ebuild | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest index b30bbc1..c012427 100644 --- a/sys-freebsd/freebsd-lib/Manifest +++ b/sys-freebsd/freebsd-lib/Manifest @@ -21,4 +21,4 @@ AUX libmap.conf 201 SHA256 36a1bd56965f171cbb058f6e1762801e3b92c083fe36f6fe046bd 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 18177 SHA256 214e7ca1c8e7436a32786ef3df4f74e6cd159ef9265c7b8bf913cb9e27ce13a5 SHA512 8589bc21ce7a58f74f06d42111b42338f7ecc9eb0024079247a8e11761ec8dba40a867487ea9de24e71e7b7be595eba79194e80bab3c21ac5695efdd7cdc4deb WHIRLPOOL 0dd8a3381317a38aaf3bc1042e956518326cfd9c70cec6720a321e134ecb01147f2c045562d075e7754ee369c62abbbdd495244f9250fa01a763d80e61bab2b6 -EBUILD freebsd-lib-9999_p255023.ebuild 18322 SHA256 142d5dff246d9800710c7f029cb68aa242cc19984e51f2d55e45409418122643 SHA512 03236165cc71acbaba8636ac153e68cc5c6ab4c303548f707574b3d9ca17532485c02119f2675bdd59506e62cd3ee202b134d59aeaa4c52de1aa5d5fd8742961 WHIRLPOOL 5ea33ca1be246f339ddbc27f5805d41efd3f444a5cdf50b7a59ca7bdb21f5472046598039631bfc17ffe06269702e773085622b6f9aa3b7a5c36a39fbab36f25 +EBUILD freebsd-lib-9999_p255023.ebuild 18348 SHA256 93f0c87858073c173f8f5ac1830ac5b403c45d0b9c49befd1fc6dec3e3161bc4 SHA512 d848cdfce13dfd1d476234585544d5ec644370d654ee09f4fcad54f3fbc0359c42f0382afb88a7def4ad99e4525da32b30a398118fae30f72370473cad107953 WHIRLPOOL 5cbba4323c1c8ed44bbedf2de1a9ec4a5f510a784f5803b565689c0d71f284e23cc4b2af10b4680e259924e681f826d3775318639e698f3f7c14098036c9dd28 diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9999_p255023.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9999_p255023.ebuild index ec2ba53..2548221 100644 --- a/sys-freebsd/freebsd-lib/freebsd-lib-9999_p255023.ebuild +++ b/sys-freebsd/freebsd-lib/freebsd-lib-9999_p255023.ebuild @@ -154,6 +154,10 @@ src_prepare() { sed -i.bak -e 's:hesiod.c::' -e 's:hesiod.3::' \ "${WORKDIR}"/lib/libc/net/Makefile.inc || die + # fix file collisions, dev-libs/libiconv-1.14:0::gentoo + # /usr/include/iconv.h + rm "${WORKDIR}"/include/iconv.h || die + # Fix the Makefiles of these few libraries that will overwrite our LDADD. cd "${S}" for dir in libradius libtacplus libcam libdevstat libfetch libgeom libmemstat libopie \ @@ -191,11 +195,6 @@ src_prepare() { if use userland_GNU; then find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \; fi - - # fix file collisions, dev-libs/libiconv-1.14:0::gentoo - # /usr/include/iconv.h - cd "${S}" - [[ -e include/iconv.h ]] && rm include/iconv.h } bootstrap_lib() { @@ -345,7 +344,7 @@ src_compile() { use usb && export NON_NATIVE_SUBDIRS="${NON_NATIVE_SUBDIRS} lib/libusb lib/libusbhid" cd "${WORKDIR}/include" - $(freebsd_get_bmake) CC="$(tc-getCC)" || die "make include failed" + WITHOUT_ICONV= $(freebsd_get_bmake) CC="$(tc-getCC)" || die "make include failed" use crosscompile_opts_headers-only && return 0 @@ -586,7 +585,7 @@ install_includes() local MACHINE="$(tc-arch-kernel)" einfo "Installing includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..." - $(freebsd_get_bmake) installincludes \ + WITHOUT_ICONV= $(freebsd_get_bmake) installincludes \ MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \ DESTDIR="${DESTDIR}" \ INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \ @@ -596,7 +595,7 @@ install_includes() for i in $EXTRA_INCLUDES; do einfo "Installing $i includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..." cd "${WORKDIR}/$i" || die - $(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \ + WITHOUT_ICONV= $(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \ MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \ INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \ BINGRP="${BINGRP}" || die "problem installing $i includes."