[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-lib/, sys-freebsd/freebsd-lib/files/

["Yuta SATOH" <nigoro.gentoo@0x100.com>]

commit:     a2e41a8ffacbfa3d6ab7a1db17e74925f50e8eeb
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Wed Dec  4 11:22:33 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Wed Dec  4 11:22:33 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=a2e41a8f

freebsd-lib-10.9999_p258774: fixed iconv issue.

---
 sys-freebsd/freebsd-lib/Manifest                   |  3 ++-
 .../files/freebsd-lib-10.0-libiconv_modules.patch  | 24 ++++++++++++++++++++++
 .../freebsd-lib/freebsd-lib-10.9999_p258774.ebuild | 13 +++++++-----
 3 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 8d04cb5..bccf6d5 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -1,4 +1,5 @@
 AUX freebsd-lib-10.0-atfcxx.patch 1545 SHA256 eef9680da13fb24adc01fab170d83787e8b9926ec2bbb89cd7933b3dd8b35306 SHA512 37d8fc83b97addef48807196738be511fdc74b002dce321c2eaf38db5b618ff4a2f8e8447677c60b96b8add8f1dc586a66a30992289fa95e20e2005589e83953 WHIRLPOOL 78096c4064b98cbb05617355c8c65c306f9d6ceb2a2c8f772cf39f20c81395da9a2d1e128f5b1382bdd65d7e6d7df2d08606933ac5fa8a9aa3d55ec8b76363e2
+AUX freebsd-lib-10.0-libiconv_modules.patch 645 SHA256 eeaf5e8dd482935982f4c232c227eadae4258e63a8dd9631cb59140ec21cbe08 SHA512 6d07c28a92985a8de517bd0eee5bf4a9ca60eee214c7111cda74d2eb6b2cfac1105b2673b09f64d9da2e54ecddf77bc27890a42a4d4f79243778f14fed8a4fdd WHIRLPOOL 27383421a4a7ee3c275db4f82ccedd3004c24d1ef5408db31f5647a06c8d31dc47b0ad3d3a202b8598676229953854656c8bc9f74febc76792dd085894c8d31b
 AUX freebsd-lib-10.0-liblink.patch 2448 SHA256 cbdcca5cc893b0d0b1ff98d1c1046519cebe9877b4cddd180340cfafbbbd2726 SHA512 c77049fa170d08d6ce035a8b9ae799f6d8e0b899371c1644a7493543fc07511515f68d54c82c618064954e48023c09bfcff452bd93e69ac07b7f8c6fc0e5089d WHIRLPOOL 12a22aeb74491960bf12da6d0db67504f1f804e732d332fd607cf58a78f0fc291af7d6a3d9f65744fedc36daa9326b463b2ebbe545d88deccc29135b6be60dbf
 AUX freebsd-lib-10.0-libproc-libcxx.patch 318 SHA256 bc1a6e7821f123c8a404ff2024264de226f0ca349f2b5b040437f74cf4a31cf4 SHA512 149101d161e1f43b0d28d131c80142ee45515f02ed0d6f8f180f2ecd2ea479607df38a37049c346dee8c848892bd64f151e094c006d32741d7c1030016e56d88 WHIRLPOOL 2f31d9b77a41bbc6ef842092b20266158e46eed6c49398fa80d193ad19c42334c4fcdb6dda82a38165730b6b37882849baf438f597f5f00a9f22e8f730017400
 AUX freebsd-lib-10.0-libusb.patch 764 SHA256 5e7bede29a900eda7ee3935203574bd6547b75864087ded60473f19dfcfa40eb SHA512 5b56af4f0ad5706001ed89075ff37b88412a1de7dd18742fdbfdd674581f20f39068fb6002c43e7ee22ae3051c11428f1c2e6cdab319da2ede065cffd330ceb9 WHIRLPOOL 2fdbe9ca0fc40b6626e40413d2364cb5de00611d674cdd6128d6e70e91fcfe0dffb60eb6c3e868907ee613f32258e519ea50e0722b180ab8021d766ebeef8370
@@ -23,5 +24,5 @@ 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-10.9999_p258774.ebuild 18845 SHA256 bd1cb454de3c146b1681176926087ebe606d85c4bd4c69acaeef7bdd6837f0c7 SHA512 02bf47e4101598638201ddcf964cedbcd6fc14c833328e69d5a79620438863c39646876eb92e98f7071045ddac1fe9f1fc70c99012dda1d539549c175c1e7f4e WHIRLPOOL e45eaaaaecd2e198989dcd06e41ac803be481fdfb31c08cb5f1fc3498f6bbc34c301d8eb99cc7e02a407393120005e2c32dc7263a8d69868ac534d12db75cd1c
+EBUILD freebsd-lib-10.9999_p258774.ebuild 19004 SHA256 768ffff60507b879443f30c970ec810bb41e5212c1f009171483a7a619794ae9 SHA512 4fd74c0c32611f3a2a18b4d6a176524c3c18b84c1df83fb16a9cf3b268311b8b279e72770bdccde038f2cfcb11e83d93637de8fa65a093530706780ef9fc9f59 WHIRLPOOL ec1bbbcc7f00a8a0a4a89d5d419eda11d3368eb46894ed9499f0ef0f22499a306db1d40b7a25413a89a9f630b4fe9e4634e38a8eb3ae504438b4f16dee5e7d65
 EBUILD freebsd-lib-9.9999.ebuild 18187 SHA256 4194f47078997d306111c39d7b5aa64991e8f3cad8124b42ab6927053597646f SHA512 d16df71160fc8ed5aa23c0894baa3b1cce734feae8f2eea837e9ea04b2a6eb0836314d05c925630db2d3be32a52b8da4c2cc79c64083cef2fe829d25fccb99ef WHIRLPOOL 5797e57eb7b1b67921426d7cfa4a8ead67b5223213cde5cffa57ce5002f34da81e9e05b5d1950681aada430ec6f3299294ab223c418ebd39854d63471a8a475a

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libiconv_modules.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libiconv_modules.patch
new file mode 100644
index 0000000..69126e5
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libiconv_modules.patch
@@ -0,0 +1,24 @@
+Should install lib/libiconv_modules to /usr/$(get_libdir)/i18n.
+
+Drop libiconv_modules from lib/Makefile. And set the following in ebuild.
+NON_NATIVE_SUBDIRS="lib/libiconv_modules"
+NATIVE_SUBDIRS="lib/libiconv_modules"
+
+Install to /usr/$(get_libdir)/i18n to force.
+mymakeopts="${mymakeopts} SHLIBDIR=/usr/$(get_libdir)/i18n LIBDIR=/usr/$(get_libdir)/i18n"
+
+
+Welcome a better solution...
+
+diff --git a/lib/Makefile b/lib/Makefile
+index 8722cc2..12a0516 100644
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -38,7 +38,6 @@ SUBDIR_ORDERED=	${_csu} \
+ 	libcompiler_rt \
+ 	libcrypt \
+ 	libelf \
+-	${_libiconv_modules} \
+ 	libkvm \
+ 	${_libldns} \
+ 	msun \

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-10.9999_p258774.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-10.9999_p258774.ebuild
index 9f4a66f..3ab127c 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-10.9999_p258774.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-10.9999_p258774.ebuild
@@ -80,7 +80,7 @@ pkg_setup() {
 	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
 	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
 
-	mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_CLANG= WITHOUT_LIBCPLUSPLUS= WITHOUT_LDNS= WITHOUT_UNBOUND= WITH_LIBICONV_COMPAT=yes "
+	mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_CLANG= WITHOUT_LIBCPLUSPLUS= WITHOUT_LDNS= WITHOUT_UNBOUND= "
 
 	if [ "${CTARGET}" != "${CHOST}" ]; then
 		mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})"
@@ -95,6 +95,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-10.0-atfcxx.patch"
 	"${FILESDIR}/${PN}-10.0-libusb.patch"
 	"${FILESDIR}/${PN}-10.0-libproc-libcxx.patch"
+	"${FILESDIR}/${PN}-10.0-libiconv_modules.patch"
 	"${FILESDIR}/${PN}-bsdxml2expat.patch"
 	"${FILESDIR}/${PN}-9.0-bluetooth.patch"
 	"${FILESDIR}/${PN}-9.1-.eh_frame_hdr-fix.patch"
@@ -256,13 +257,13 @@ bootstrap_libthr() {
 
 # What to build for a cross-compiler.
 # We also need the csu but this has to be handled separately.
-CROSS_SUBDIRS="lib/libc lib/msun gnu/lib/libssp/libssp_nonshared lib/libthr lib/libutil lib/librt"
+CROSS_SUBDIRS="lib/libc lib/msun gnu/lib/libssp/libssp_nonshared lib/libthr lib/libutil lib/librt lib/libc_nonshared"
 
 # What to build for non-default ABIs.
-NON_NATIVE_SUBDIRS="${CROSS_SUBDIRS} gnu/lib/csu lib/libcompiler_rt gnu/lib/libgcc lib/libmd lib/libcrypt lib/libsbuf lib/libcam lib/libelf lib/libiconv_modules lib/libiconv_compat"
+NON_NATIVE_SUBDIRS="${CROSS_SUBDIRS} gnu/lib/csu lib/libcompiler_rt gnu/lib/libgcc lib/libmd lib/libcrypt lib/libsbuf lib/libcam lib/libelf lib/libiconv_modules"
 
 # Subdirs for a native build:
-NATIVE_SUBDIRS="lib gnu/lib/libssp/libssp_nonshared gnu/lib/libregex gnu/lib/csu gnu/lib/libgcc lib/libiconv_compat"
+NATIVE_SUBDIRS="lib gnu/lib/libssp/libssp_nonshared gnu/lib/libregex gnu/lib/csu gnu/lib/libgcc lib/libiconv_modules"
 
 # Is my $ABI native ?
 is_native_abi() {
@@ -403,6 +404,8 @@ gen_libc_ldscript() {
 	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
 	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
 
+	# iconv symbol provided by libc_nonshared.a.
+	# http://svnweb.freebsd.org/base?view=revision&amp;revision=258283
 	cat > "${D}/$2/libc.so" <<-END_LDSCRIPT
 /* GNU ld script
    SSP (-fstack-protector) requires __stack_chk_fail_local to be local.
@@ -411,7 +414,7 @@ gen_libc_ldscript() {
    libssp_nonshared.a from here.
  */
 ${output_format}
-GROUP ( /$1/libc.so.7 /$3/libssp_nonshared.a )
+GROUP ( /$1/libc.so.7 /$3/libc_nonshared.a /$3/libssp_nonshared.a )
 END_LDSCRIPT
 }