| 1 |
commit: 4649e728a49586456a5e19d1fc61cb180841ef57 |
| 2 |
Author: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp> |
| 3 |
AuthorDate: Sat Aug 31 15:51:15 2013 +0000 |
| 4 |
Commit: Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com> |
| 5 |
CommitDate: Sat Aug 31 15:51:15 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=4649e728 |
| 7 |
|
| 8 |
freebsd-lib-9999_p255023: Correctly fix WITHOUT_ICONV= |
| 9 |
|
| 10 |
--- |
| 11 |
sys-freebsd/freebsd-lib/Manifest | 2 +- |
| 12 |
sys-freebsd/freebsd-lib/freebsd-lib-9999_p255023.ebuild | 15 +++++++-------- |
| 13 |
2 files changed, 8 insertions(+), 9 deletions(-) |
| 14 |
|
| 15 |
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest |
| 16 |
index b30bbc1..c012427 100644 |
| 17 |
--- a/sys-freebsd/freebsd-lib/Manifest |
| 18 |
+++ b/sys-freebsd/freebsd-lib/Manifest |
| 19 |
@@ -21,4 +21,4 @@ AUX libmap.conf 201 SHA256 36a1bd56965f171cbb058f6e1762801e3b92c083fe36f6fe046bd |
| 20 |
AUX libusb-1.0.pc.in 207 SHA256 edf35e887cbfed2df288825434c467e0a946eeb21e0d631f55940bb177c2ba15 SHA512 93289cecfc298a31fd4fd0848bf25a63048a7549bd81792d7bd158731246221c24ec9f469a918430da56873a0936fb2b372cedaaa32a38ccd5323de0f9a89b93 WHIRLPOOL 7c81b0df4548a9391b4e1420186f1e970aa9e2e73a89e817adbff9de52b8797cbd8a4d8b3ca01f782f86e4b1e48fad72a08b5bff49d5ee6ffaa5135c015ca5ae |
| 21 |
AUX libusb.pc.in 208 SHA256 9bfe398a335f8b9b1c3dd167ab0c9206fe3bdd4e1da318ece977e20f3c2d7c56 SHA512 e9c6d5f04057cf8c13f69a3d8e07bdd517fdb01d572a69a1beb397766311b3c53894b108caaaea740bfc27b227a9620621dac5846bff1a367fbf9954f38bb40c WHIRLPOOL e80e76a8a564655d924a7148a841c7c7cf0be0ea3bdbd76e95e5004124543826e5d925dfe791f4b040e042a10923865bb517499d9f5be39611fedbcceebe32d8 |
| 22 |
EBUILD freebsd-lib-9.9999.ebuild 18177 SHA256 214e7ca1c8e7436a32786ef3df4f74e6cd159ef9265c7b8bf913cb9e27ce13a5 SHA512 8589bc21ce7a58f74f06d42111b42338f7ecc9eb0024079247a8e11761ec8dba40a867487ea9de24e71e7b7be595eba79194e80bab3c21ac5695efdd7cdc4deb WHIRLPOOL 0dd8a3381317a38aaf3bc1042e956518326cfd9c70cec6720a321e134ecb01147f2c045562d075e7754ee369c62abbbdd495244f9250fa01a763d80e61bab2b6 |
| 23 |
-EBUILD freebsd-lib-9999_p255023.ebuild 18322 SHA256 142d5dff246d9800710c7f029cb68aa242cc19984e51f2d55e45409418122643 SHA512 03236165cc71acbaba8636ac153e68cc5c6ab4c303548f707574b3d9ca17532485c02119f2675bdd59506e62cd3ee202b134d59aeaa4c52de1aa5d5fd8742961 WHIRLPOOL 5ea33ca1be246f339ddbc27f5805d41efd3f444a5cdf50b7a59ca7bdb21f5472046598039631bfc17ffe06269702e773085622b6f9aa3b7a5c36a39fbab36f25 |
| 24 |
+EBUILD freebsd-lib-9999_p255023.ebuild 18348 SHA256 93f0c87858073c173f8f5ac1830ac5b403c45d0b9c49befd1fc6dec3e3161bc4 SHA512 d848cdfce13dfd1d476234585544d5ec644370d654ee09f4fcad54f3fbc0359c42f0382afb88a7def4ad99e4525da32b30a398118fae30f72370473cad107953 WHIRLPOOL 5cbba4323c1c8ed44bbedf2de1a9ec4a5f510a784f5803b565689c0d71f284e23cc4b2af10b4680e259924e681f826d3775318639e698f3f7c14098036c9dd28 |
| 25 |
|
| 26 |
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9999_p255023.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9999_p255023.ebuild |
| 27 |
index ec2ba53..2548221 100644 |
| 28 |
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9999_p255023.ebuild |
| 29 |
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9999_p255023.ebuild |
| 30 |
@@ -154,6 +154,10 @@ src_prepare() { |
| 31 |
sed -i.bak -e 's:hesiod.c::' -e 's:hesiod.3::' \ |
| 32 |
"${WORKDIR}"/lib/libc/net/Makefile.inc || die |
| 33 |
|
| 34 |
+ # fix file collisions, dev-libs/libiconv-1.14:0::gentoo |
| 35 |
+ # /usr/include/iconv.h |
| 36 |
+ rm "${WORKDIR}"/include/iconv.h || die |
| 37 |
+ |
| 38 |
# Fix the Makefiles of these few libraries that will overwrite our LDADD. |
| 39 |
cd "${S}" |
| 40 |
for dir in libradius libtacplus libcam libdevstat libfetch libgeom libmemstat libopie \ |
| 41 |
@@ -191,11 +195,6 @@ src_prepare() { |
| 42 |
if use userland_GNU; then |
| 43 |
find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \; |
| 44 |
fi |
| 45 |
- |
| 46 |
- # fix file collisions, dev-libs/libiconv-1.14:0::gentoo |
| 47 |
- # /usr/include/iconv.h |
| 48 |
- cd "${S}" |
| 49 |
- [[ -e include/iconv.h ]] && rm include/iconv.h |
| 50 |
} |
| 51 |
|
| 52 |
bootstrap_lib() { |
| 53 |
@@ -345,7 +344,7 @@ src_compile() { |
| 54 |
use usb && export NON_NATIVE_SUBDIRS="${NON_NATIVE_SUBDIRS} lib/libusb lib/libusbhid" |
| 55 |
|
| 56 |
cd "${WORKDIR}/include" |
| 57 |
- $(freebsd_get_bmake) CC="$(tc-getCC)" || die "make include failed" |
| 58 |
+ WITHOUT_ICONV= $(freebsd_get_bmake) CC="$(tc-getCC)" || die "make include failed" |
| 59 |
|
| 60 |
use crosscompile_opts_headers-only && return 0 |
| 61 |
|
| 62 |
@@ -586,7 +585,7 @@ install_includes() |
| 63 |
local MACHINE="$(tc-arch-kernel)" |
| 64 |
|
| 65 |
einfo "Installing includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..." |
| 66 |
- $(freebsd_get_bmake) installincludes \ |
| 67 |
+ WITHOUT_ICONV= $(freebsd_get_bmake) installincludes \ |
| 68 |
MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \ |
| 69 |
DESTDIR="${DESTDIR}" \ |
| 70 |
INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \ |
| 71 |
@@ -596,7 +595,7 @@ install_includes() |
| 72 |
for i in $EXTRA_INCLUDES; do |
| 73 |
einfo "Installing $i includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..." |
| 74 |
cd "${WORKDIR}/$i" || die |
| 75 |
- $(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \ |
| 76 |
+ WITHOUT_ICONV= $(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \ |
| 77 |
MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \ |
| 78 |
INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \ |
| 79 |
BINGRP="${BINGRP}" || die "problem installing $i includes." |
Archives