From: "Yuta SATOH" <nigoro.gentoo@0x100.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-lib/, sys-freebsd/freebsd-lib/files/
Date: Fri, 28 Jun 2013 10:49:15 +0000 (UTC) [thread overview]
Message-ID: <1372416535.9f831b9bc6680a70068d1ec3aaa381464afd6286.yuta_satoh@gentoo> (raw)
commit: 9f831b9bc6680a70068d1ec3aaa381464afd6286
Author: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Fri Jun 28 10:48:55 2013 +0000
Commit: Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Fri Jun 28 10:48:55 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=9f831b9b
freebsd-lib-9.9999: sync to 9.1-r9 ebuild.
---
sys-freebsd/freebsd-lib/Manifest | 3 ++-
.../files/freebsd-lib-9.1-rmgssapi.patch | 16 +++++++++++++
sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild | 26 ++++++++++++----------
3 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 56d4475..5138ee2 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -11,6 +11,7 @@ AUX freebsd-lib-9.0-netware.patch 400 SHA256 e83d43f5bf9461c3d332365cca12db7b041
AUX freebsd-lib-9.0-opieincludes.patch 4495 SHA256 0868e7454053170c3399f1a03a68f3e70410c79db865e7e2f2b51f5961b5718b SHA512 a3828985f7da9e72ad44d88640952d56079693024bc11b4e3cca86b6f455a9e4756ba76f9e6d4c15960898f39e1dac7bc833e3241082f532c7fbd6d7d6f9418b WHIRLPOOL e0180dd0086c054e9f6895ecfe34bfb21d0e1db483dfc63ad411c651954c4703996d9b537a9566133a01770f2cf0f331727865013413181728c3b21740735473
AUX freebsd-lib-9.0-trylock-adaptive.patch 439 SHA256 af501c40124e628c2f739d88a4efa7ef3513694bd79ab44db30e4b3f73864612 SHA512 ceeeea302294db5a25b5534685dce563778572010f0072ecb300a66550ee8cc241e0ae5523e32fd5424560e82d913c37aefe06c2a6725e951ba4ad5df73a1a68 WHIRLPOOL d2a65eab4b03a7fb65e2dd6f03c2e60fe1248412e28a0829757e6cb733d1f487ee79959680f1db8af20fc409a165c5f4aea3038171e7b82aee7d38c29552531e
AUX freebsd-lib-9.1-.eh_frame_hdr-fix.patch 695 SHA256 6c6d7a958c989edc6ee76c5b9c2146fa449adda11c3b89b550780c7a78d93190 SHA512 c40270e8890a1152a6f2e705461ac64f8cc44e6d0306d895a0d146017d4fe3553853de88178e0744fc1be4197a4eb35b578c68593c80467dd8cf15c35720413d WHIRLPOOL 1fa3c5cdba333951b918eb5c1eb793ab49921268a6a397e38f2adad383c2c03ccf382892ed8d44e2480f8ca891ce3c3a0b122a026cbf232058ac3bcf2f2d5133
+AUX freebsd-lib-9.1-rmgssapi.patch 699 SHA256 0dc94a565f140beca0800446c72bd874f99c56125181f7a037154dcd898d2615 SHA512 cb0b292cca0c321ed72b1a792a3975be239303b3990efc6665b0c960dfe17fdbb4529405286c0a956c4b4711462d2ee9d7d1c9d343ad3246b43c49edfc87dae0 WHIRLPOOL 55adff8c3436959b4545ba54c0eff3cd640dd4f0d0871bd66dad2501c04e84eb24f27b882dde9050b088dadecc9af6049493e848a1d508646149075180c8c414
AUX freebsd-lib-9.9999-flex.patch 397 SHA256 0beba174e1946bf9a5e703443acd33eb95c9df12d33515cd734746dd13b9fb38 SHA512 9fe3854e35ee8ce11f8a150297eb2e1e7d1d0de9a809023aa6d86e12110124bca01ee0040df91e4af5f0bc671d9570719687044bceaf25633fe4771801f54112 WHIRLPOOL 2a628aa4c5ecd90e6706da1ecb290925bba088ba1f865f8c3de51cce3955d5826681481a0a5bb1bc270f64dd00a085e0dba530ae9cd6bb77df292ddb24b8dc8d
AUX freebsd-lib-9.9999-telnet.h.patch 497 SHA256 46e9ef90213e61e0dc31897a89d5103cce76ac7dbc51888a38fb144f94a35af8 SHA512 537df980f8675d72ed8ad872f382bf9c7bc1bbe3efe5e3d8e5e175feb45ed40dbc115d6b11983fa66abdd33e3c7fefa31c2f736db82ef1d2c81dc0a633e8855a WHIRLPOOL bb9353449455eb93ee4ac0584732110913daefe9c56d1372aaad6c5a3f9ba65f32fef236f1d1491982a21541f0ff7ebaf9dde6e7d36f269938206133a992939d
AUX freebsd-lib-bsdxml2expat.patch 708 SHA256 0c3ec3657155c5032479181119c488d43a479ab0dfe7a7d7ed0dabce16853e85 SHA512 d3b321062886ee636a09af4b8714ae90317c17eb954a3d491cd21ca90605e26491033df4d6f02a517eda423783db74dad16adf7ee1bdc5557392cc70218ee9c7 WHIRLPOOL 5c262c59aee9e642d3a8929a453b56c7a55ba60f3011d6ac07b750a30297eb992a564ba4db18714b7eac58bbe3ded1ff4249150128947d25dd1344e59e16c9cb
@@ -19,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 18226 SHA256 125ab601dfb05dcf14448f34fd30688bcd01fd82a5b1036f79a24535093bb154 SHA512 f41b5ccf468388a0e464b640537e971624a23aaf02cba0b3f8f4d5b097f61715cd617d711df645bee682182522f771dfb49168b3beeec40cf9a4cc3a1d830ce5 WHIRLPOOL b40033f1c22f55af8033ed7eb3baf50b27195cb2b25005d986fde097d2d74873bde37d4b6cc78e2245a38c279515a2a3e2f27fd53410c00cef6e523230566e23
+EBUILD freebsd-lib-9.9999.ebuild 18247 SHA256 532de3d66f54a9a3895f239a853c4635af21ed3db10da0362acc1bc8426376aa SHA512 c8802ed5cf8b5d47e9e14dcff03655675eab7b5e54ba98bb79f9c3cfd365ae2f0256b1e0f03b6cb5133360344a0afae0168725ba78e71a4d58d6e65833b8e719 WHIRLPOOL b309f937ff605bbd1dbe27df2c3477bd4afef330f31e62edb6e66d090e28db48172bb49fd513779b0087927cbe8ec82dfc8d9a4e1fbb3b9ab66529454de4ecc9
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.1-rmgssapi.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.1-rmgssapi.patch
new file mode 100644
index 0000000..62357e0
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.1-rmgssapi.patch
@@ -0,0 +1,16 @@
+--- include/Makefile.orig 2013-06-16 10:47:52.000000000 +0200
++++ include/Makefile 2013-06-16 10:47:37.000000000 +0200
+@@ -6,11 +6,11 @@
+ .include <bsd.own.mk>
+
+ CLEANFILES= osreldate.h version vers.c
++SUBDIR= arpa protocols rpcsvc rpc xlocale
+-SUBDIR= arpa gssapi protocols rpcsvc rpc xlocale
+ INCS= a.out.h ar.h assert.h bitstring.h complex.h cpio.h _ctype.h ctype.h \
+ db.h \
+ dirent.h dlfcn.h elf.h elf-hints.h err.h fmtmsg.h fnmatch.h fstab.h \
++ fts.h ftw.h getopt.h glob.h grp.h \
+- fts.h ftw.h getopt.h glob.h grp.h gssapi.h \
+ ieeefp.h ifaddrs.h \
+ inttypes.h iso646.h kenv.h langinfo.h libgen.h limits.h link.h \
+ locale.h malloc.h malloc_np.h memory.h monetary.h mpool.h mqueue.h \
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild
index f4dc8f8..1f34233 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild
@@ -31,7 +31,7 @@ fi
if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
RDEPEND="ssl? ( dev-libs/openssl )
hesiod? ( net-dns/hesiod )
- kerberos? ( virtual/krb5 )
+ kerberos? ( app-crypt/heimdal )
usb? ( !dev-libs/libusb !dev-libs/libusbx )
zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )
>=dev-libs/expat-2.0.1
@@ -72,7 +72,7 @@ pkg_setup() {
use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
use hesiod || mymakeopts="${mymakeopts} WITHOUT_HESIOD= "
use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6_SUPPORT= "
- use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
+ use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= WITHOUT_GSSAPI= "
use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
@@ -88,9 +88,7 @@ pkg_setup() {
PATCHES=(
"${FILESDIR}/${PN}-6.0-pmc.patch"
- "${FILESDIR}/${PN}-6.0-gccfloat.patch"
"${FILESDIR}/${PN}-6.1-csu.patch"
- "${FILESDIR}/${PN}-8.0-rpcsec_gss.patch"
"${FILESDIR}/${PN}-9.0-liblink.patch"
"${FILESDIR}/${PN}-9.0-bluetooth.patch"
"${FILESDIR}/${PN}-9.0-netware.patch"
@@ -121,7 +119,8 @@ REMOVE_SUBDIRS="ncurses \
libpam libpcap bind libwrap libmagic \
libcom_err libtelnet
libelf libedit
- libstand"
+ libstand
+ libgssapi"
# For doing multilib over multibuild.eclass
MULTIBUILD_VARIANTS=( $(get_all_abis) )
@@ -154,6 +153,7 @@ src_prepare() {
epatch "${FILESDIR}/${PN}-includes.patch"
epatch "${FILESDIR}/${PN}-8.0-gcc45.patch"
epatch "${FILESDIR}/${PN}-9.0-opieincludes.patch"
+ epatch "${FILESDIR}/${PN}-9.1-rmgssapi.patch"
epatch "${FILESDIR}/${PN}-9.9999-telnet.h.patch"
# Don't install the hesiod man page or header
@@ -236,6 +236,12 @@ bootstrap_libssp_nonshared() {
export LDADD="-lssp_nonshared"
}
+bootstrap_libc() {
+ cd "${WORKDIR}/lib/libc" || die
+ freebsd_src_compile
+ append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libc"
+}
+
bootstrap_libgcc() {
cd "${WORKDIR}/lib/libcompiler_rt" || die
freebsd_src_compile
@@ -243,9 +249,7 @@ bootstrap_libgcc() {
ln -s libcompiler_rt.a libgcc.a || die
append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libcompiler_rt"
- cd "${WORKDIR}/lib/libc" || die
- freebsd_src_compile
- append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libc"
+ bootstrap_libc
cd "${WORKDIR}/gnu/lib/libgcc" || die
freebsd_src_compile
@@ -310,10 +314,8 @@ do_bootstrap() {
fi
bootstrap_csu
bootstrap_libssp_nonshared
- if ! is_crosscompile && ! is_native_abi ; then
- # Bootstrap the compiler libs
- bootstrap_libgcc
- fi
+ is_crosscompile && bootstrap_libc
+ is_crosscompile || is_native_abi || bootstrap_libgcc
}
# Compile it. Assume we have the toolchain setup correctly.
next reply other threads:[~2013-06-28 10:49 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-28 10:49 Yuta SATOH [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-07-13 3:14 [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-lib/, sys-freebsd/freebsd-lib/files/ Yuta SATOH
2013-12-19 13:01 Yuta SATOH
2013-12-19 11:17 Yuta SATOH
2013-12-04 11:22 Yuta SATOH
2013-12-02 11:31 Yuta SATOH
2013-10-23 11:10 Yuta SATOH
2013-09-18 12:22 Yuta SATOH
2013-09-17 13:28 Yuta SATOH
2013-08-30 18:30 Yuta SATOH
2013-08-13 13:06 Yuta SATOH
2013-06-28 10:49 Yuta SATOH
2013-03-20 10:35 Yuta SATOH
2013-03-05 16:37 Yuta SATOH
2012-12-25 16:07 Yuta SATOH
2012-11-29 14:07 Yuta SATOH
2012-09-20 11:39 Yuta SATOH
2012-09-18 15:46 Yuta SATOH
2012-09-11 17:10 Alexis Ballier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1372416535.9f831b9bc6680a70068d1ec3aaa381464afd6286.yuta_satoh@gentoo \
--to=nigoro.gentoo@0x100.com \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox