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/
Date: Fri, 27 Jul 2012 12:25:33 +0000 (UTC) [thread overview]
Message-ID: <1343391375.6e0525faaf5ef16ebd447148bf05d78b9ce1836b.yuta_satoh@gentoo> (raw)
commit: 6e0525faaf5ef16ebd447148bf05d78b9ce1836b
Author: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Fri Jul 27 12:16:15 2012 +0000
Commit: Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Fri Jul 27 12:16:15 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=6e0525fa
freebsd-lib -- fixes bug #419477
---
sys-freebsd/freebsd-lib/Manifest | 13 ++++++++++++-
...-9.1_beta1.ebuild => freebsd-lib-9.0-r3.ebuild} | 13 ++++++++++---
.../freebsd-lib/freebsd-lib-9.1_beta1.ebuild | 7 +++++++
3 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index c662678..d458b38 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -21,24 +21,35 @@ AUX freebsd-lib-new_as.patch 1494 RMD160 36ac871434f9994d5a0d7e1b73765c055d49948
AUX freebsd-sources-9.0-sysctluint.patch 403 RMD160 46bb18c424ea7011db86341e427fd095495c4bcc SHA1 9d3c1606c886d96a88c89283bc18a2717c87fc76 SHA256 884fbc5d6d3766ea3d4609946f56072f36f95368dc13ee316c330a46d42f0c9e
AUX libmap.conf 201 RMD160 ad0ab6c08b5c541e0e45636dcbbaa468bbae2f95 SHA1 df81db07a94d988f1c41b4696b4d3b0058e73f83 SHA256 36a1bd56965f171cbb058f6e1762801e3b92c083fe36f6fe046bd669beed9742
AUX libusb.pc.in 208 RMD160 13c7e5587c565453fc6a11d156da302fa7590ee0 SHA1 f0f9815fa27a8f1cf8405c1a8987df5d5d6a6b1b SHA256 9bfe398a335f8b9b1c3dd167ab0c9206fe3bdd4e1da318ece977e20f3c2d7c56
+DIST freebsd-cddl-9.0.tar.bz2 878299 RMD160 187504c1cd008c47d71a60be496eab62846bd3c8 SHA1 5eb6d065afe49ae48d1b3581038b30bf43532ca7 SHA256 80d2efbe5a0dcba98050e420ecc16c6fb8ad4c410c05424a5bf6800de58ced4b
DIST freebsd-cddl-9.1_beta1.tar.bz2 909373 RMD160 7b19518f8b29a89089c417d6eab882ce5b0a48ee SHA1 a324b048a35a341bcfba1f085c3938faf34f5891 SHA256 c4effa8f88f37f828d58dd708806234e72259ec8558b93c820c085ab9994dca1
DIST freebsd-contrib-8.1.tar.bz2 41505936 SHA1 1235434a067c1445ff8fb0efa395ef5fb2746b9a SHA256 5933b9172af92242519427c033e753150950d444a653c9ba9491b024d9eb2cf3
+DIST freebsd-contrib-9.0.tar.bz2 53993596 RMD160 b0e602dec32f4dc9ba29b132b3d27fb98fc95cb9 SHA1 e637f40d0f0ed2441b9a7737c88451e1327384c1 SHA256 5c7daec9f77bb295d9e65e35017fc625320423623e7e9bee98645a20f10ed14c
DIST freebsd-contrib-9.1_beta1.tar.bz2 54324352 RMD160 01b581aea0028134fcbdf4fe8fbba85a1080c8ec SHA1 b67ee1228abb94795e7c637b135905fa040a1b06 SHA256 cd3d33bd29ef5b228583fd18885292dd712041d21afe66ef0e19b20600a91c3f
DIST freebsd-crypto-8.1.tar.bz2 5651981 SHA1 d5be0a484409e709bfb8c217cf7db09c24d4b3f4 SHA256 150ed869b30f02db8aee01dc1591771be90b33b6338e557a11d5a78db4995ff6
+DIST freebsd-crypto-9.0.tar.bz2 5669925 RMD160 fb0a5815254ad1aa601e621349059edcccd2c493 SHA1 a6b5e8cb3214adbeef10f9f39058bfabb0c00f95 SHA256 98f1a203d20c1a8884a04a0349d49c75f257dddfd71a4c3c60414d535dd782a8
DIST freebsd-crypto-9.1_beta1.tar.bz2 5696411 RMD160 aeab4bf9c139c6169ea2ef205f0f75f1884ff3a4 SHA1 5652bfed33e65be3c60b1ce7ad1ee5df6ed53f0c SHA256 72fc20493e6e66c5a701b6ff04a45045fc119a79f40bda2087592eb2aaed909a
DIST freebsd-etc-8.1.tar.bz2 186545 SHA1 f16fc5717fb2b2f7a5196e2c6b7e43a975b2ca90 SHA256 5abd47694c12aa5acf278474942bf772cd5d3a99cc89b14e4fa378c1d8acea8c
+DIST freebsd-etc-9.0.tar.bz2 207258 RMD160 67688c29d95270f03a43ed3f15f31bae1ccbe1c7 SHA1 03a7d766a451d61cb9a5677f3cf49f4ef62f706a SHA256 a4fe6ae59e966bdc3129613ebeb61d8247588125d2157855838f267a84c744d1
DIST freebsd-etc-9.1_beta1.tar.bz2 205684 RMD160 d7f6a1fd4c3ad9cf36190957691d02932a849a9a SHA1 9dd4d8d898035bb586b8756809bbecb82420f6af SHA256 7aa2155570daad76fbb8ccaeef3840ffc1fe385e7d20b4534d70e63eb3dc0a51
DIST freebsd-gnu-8.1.tar.bz2 818430 SHA1 762be40e717cdb21f572865ae2dbad4055dc2439 SHA256 222e7341ec912832583cf364d9c19487ee763c1290d0f16549934e9fb0545064
+DIST freebsd-gnu-9.0.tar.bz2 783723 RMD160 f0776cb32a30f173acbebb4bedfc103c029769dc SHA1 f0db654d836ad03e06adc2a528a612fb14503930 SHA256 39d2215e97f321d08b3c1de9dd5572aa1fe0ae9577d5ed6d6b3dc9221bc33e2c
DIST freebsd-gnu-9.1_beta1.tar.bz2 802694 RMD160 b2a1ab81c30c3c40a5bbf980a0b63d82a760b85b SHA1 897e3a0032be5d6ea719ed5e48c5ff283323972e SHA256 b794c84343eec01d82c11a114c0262271fe59e52b630ed6524cfe7a2fbeafba4
DIST freebsd-include-8.1.tar.bz2 139066 SHA1 30e23794b7efdb61f7e692eb2913f082e5f984ed SHA256 122e58904ea9fc403f44b23a106df486cd3bcc89b7cddcec95b5a56a90c1370a
+DIST freebsd-include-9.0.tar.bz2 141657 RMD160 5ad8d85f5c1d8adef755684b704e21db5e7fbff5 SHA1 3b6304699da72b15754c0f1a9cc6594a0c26fee1 SHA256 bd0196dfeb7e491638f76d626dd02d122a7702bbddd7330f6aeb4f44e4c7dcf0
DIST freebsd-include-9.1_beta1.tar.bz2 146786 RMD160 3a1d80f481967008541f5b300179cf35109f1c38 SHA1 4316c8f31326b67e63d6f6bdf16974838b872d8a SHA256 3982d25ca4fec4978b22e53d525da5599583690cd3bb93e5bc4deedaae2a43c5
DIST freebsd-lib-8.1.tar.bz2 3314868 SHA1 c44d7b8b5bfd8ec0bec0500210e8147ef8041dfb SHA256 af7ace10ae7788f90ae25e82b2034d7e93e6a4129c34f78b883c6fc1d467ac55
+DIST freebsd-lib-9.0.tar.bz2 3547388 RMD160 4b0de140bad6bb7fa9423d7d96ff695b0aba1ecd SHA1 6ffb802e0f8433b5a83128f55ead4e6759059a53 SHA256 920a4fdcdbcc980328bc2156e3e9d07353c3982db495f341b63815142cf6a03a
DIST freebsd-lib-9.1_beta1.tar.bz2 3212108 RMD160 86daf233379f9c5600ad702455f93f1526793bda SHA1 96204524a13089282ba2cc67d488c40042ef2c3d SHA256 3206a7a9a87403518b3a0136971468cbdaee60510729156e37733f3e1a49bec1
DIST freebsd-libexec-8.1.tar.bz2 281958 SHA1 4be5da6d0fee935df3731587bb967f0225c10b19 SHA256 fbd03c7b34bf294d6ce2a999d7dab1b6dffd07253b2242f2608a3cdb35720623
+DIST freebsd-libexec-9.0.tar.bz2 298680 RMD160 2f27821e1e9cccc409a6f4762957dcf851306237 SHA1 f8c023cf511f5b53724124f062bd9c8269353bb1 SHA256 2b259cdb01e520a875af2c04553dd096178aa6f243e11f7215e461ecd13c945e
DIST freebsd-libexec-9.1_beta1.tar.bz2 309755 RMD160 d293a6647d31ff0f7f4fa075e5e47dd33a0d6ed8 SHA1 05318a8326060ea5bd65b355ecc465366e815a76 SHA256 ddb686cd63c374203a9f4449332ba7d2cc097f5e95b25b2f1b84abf33c09c48d
DIST freebsd-sys-8.1.tar.bz2 24173113 SHA1 19af10e8b66ef07dc9fe4f991164369aea52feba SHA256 6226c119e8b8f3d2e3d1697cc564a482978730afce7e25d472feecd962cda938
+DIST freebsd-sys-9.0.tar.bz2 30369960 RMD160 137ac728d78767eae184ac0bf00014d1bfeffc37 SHA1 cc09df384bd519ddf39254605a5ad80f702f3d68 SHA256 1c5e2181db9e92209933b1de9488109d88f0b2f15d07ee37aa491920e1990a54
DIST freebsd-sys-9.1_beta1.tar.bz2 32431009 RMD160 7d6c62f051f7a49fbd73645bdfe3c26777d3a741 SHA1 183b5c29fa3af5d2173918f91fe47f6e0f30a157 SHA256 f0aa625b61314781104a978d8a726f2dee4bb4c4510f92e512b4d035a3ff4ccc
DIST freebsd-usbin-8.1.tar.bz2 2467364 SHA1 c178890bae87238ae5a6254a022e7825808cda1f SHA256 5bacdb59c1e73137af62cddf837429fa0c35f0f7fea5a57aafb7bcf220823dd7
+DIST freebsd-usbin-9.0.tar.bz2 2608252 RMD160 fb070b602615289a849ec19d35b670bc2290423b SHA1 db82960e36f7585b25b09fa686328bcd9f7cfcb3 SHA256 384ab18281aa1afb39a0f98bcef0fc734840fd294b22b7d405b0d3eee8f835ea
DIST freebsd-usbin-9.1_beta1.tar.bz2 2681064 RMD160 94a64404315913df9842a83a27217aa3372c4ddd SHA1 6f59c65d14adbc6af4c7ab574782ef99cdfc690a SHA256 c0c2dee233dbdb499d8c6e65680d2f316b19d490ba115c54c20ce12e665d64ee
EBUILD freebsd-lib-8.1.ebuild 14600 RMD160 6a4b04f660a84b64d75495260000ece9422cd19d SHA1 ee888e446ba13914c473231c2353582cb375a5f8 SHA256 8c8b09f192af3869059b3a6e1e694e7411df208caedb049cc69ce0600f9d8c71
-EBUILD freebsd-lib-9.1_beta1.ebuild 16895 RMD160 d377f2e560e200057b9c741c20508d542105591d SHA1 dc2d9392737994daedf81c5415648db4fb093d2d SHA256 7fc1900efb230b8302f34d2e1b5d602b0043122ae832831beacc7c59267b8e54
+EBUILD freebsd-lib-9.0-r3.ebuild 17176 RMD160 9a8cc782332a4b724ef7c82c1556e2899ee6505f SHA1 6cd818bb5d9ecc6111c4c665a7429c284821de01 SHA256 66c8e22e87cc7e5ceea4f65630ddaca3b780c2d5d54c08ade8d64c0ba70d084d
+EBUILD freebsd-lib-9.1_beta1.ebuild 17276 RMD160 916a77f43dcd2ce29ad6b15218e39668353abe46 SHA1 a0eb21485b81ddaf2034f0444de86bb72694bff1 SHA256 bb1c8fdaaf30e296e518516c6c3d27b63f101951979e05b0c5b0b953afef50a5
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.1_beta1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild
similarity index 97%
copy from sys-freebsd/freebsd-lib/freebsd-lib-9.1_beta1.ebuild
copy to sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild
index 23b7df0..bf49daf 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.1_beta1.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild,v 1.7 2012/06/11 13:57:31 aballier Exp $
+# $Header: $
EAPI=2
@@ -85,13 +85,13 @@ pkg_setup() {
}
PATCHES=(
- "${FILESDIR}/${PN}-6.0-pmc.patch"
"${FILESDIR}/${PN}-6.0-gccfloat.patch"
"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
"${FILESDIR}/${PN}-6.1-csu.patch"
"${FILESDIR}/${PN}-8.0-rpcsec_gss.patch"
"${FILESDIR}/${PN}-9.0-liblink.patch"
- "${FILESDIR}/${PN}-bsdxml2expat.patch" )
+ "${FILESDIR}/${PN}-bsdxml2expat.patch"
+ "${FILESDIR}/${PN}-9.0-trylock-adaptive.patch" )
# Here we disable and remove source which we don't need or want
# In order:
@@ -301,6 +301,13 @@ do_compile() {
export RAW_LDFLAGS=$(raw-ldflags)
+ #fixes bug 419477, multilib support
+ cd "${S}"
+ sed -i -e "s:^LDFLAGS+=.*:LDFLAGS+=-L ${MAKEOBJDIRPREFIX}/${S}/libgssapi:" \
+ librpcsec_gss/Makefile || die "Problem fixing \"librpcsec_gss/Makefile"
+ sed -i -e "s:^LDFLAGS+=.*:LDFLAGS+=-L ${MAKEOBJDIRPREFIX}/${S}/libutil -L ${MAKEOBJDIRPREFIX}/${S}/libproc:" \
+ librtld_db/Makefile || die "Problem fixing \"librtld_db/Makefile"
+
# Everything is now setup, build it!
for i in $(get_subdirs) ; do
einfo "Building in ${i}... with CC=${CC} and CFLAGS=${CFLAGS}"
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.1_beta1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.1_beta1.ebuild
index 23b7df0..8dfb16a 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.1_beta1.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.1_beta1.ebuild
@@ -301,6 +301,13 @@ do_compile() {
export RAW_LDFLAGS=$(raw-ldflags)
+ #fixes bug 419477, multilib support
+ cd "${S}"
+ sed -i -e "s:^LDFLAGS+=.*:LDFLAGS+=-L ${MAKEOBJDIRPREFIX}/${S}/libgssapi:" \
+ librpcsec_gss/Makefile || die "Problem fixing \"librpcsec_gss/Makefile"
+ sed -i -e "s:^LDFLAGS+=.*:LDFLAGS+=-L ${MAKEOBJDIRPREFIX}/${S}/libutil -L ${MAKEOBJDIRPREFIX}/${S}/libproc:" \
+ librtld_db/Makefile || die "Problem fixing \"librtld_db/Makefile"
+
# Everything is now setup, build it!
for i in $(get_subdirs) ; do
einfo "Building in ${i}... with CC=${CC} and CFLAGS=${CFLAGS}"
next reply other threads:[~2012-07-27 12:25 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-27 12:25 Yuta SATOH [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-08-04 10:10 [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-lib/ Yuta SATOH
2012-09-18 15:46 Yuta SATOH
2012-09-19 15:25 Yuta SATOH
2012-12-01 14:24 Yuta SATOH
2012-12-02 12:01 Yuta SATOH
2012-12-11 15:07 Yuta SATOH
2012-12-31 9:51 Yuta SATOH
2013-01-01 15:10 Yuta SATOH
2013-01-10 11:58 Yuta SATOH
2013-01-12 11:09 Yuta SATOH
2013-01-26 13:16 Yuta SATOH
2013-02-07 13:14 Yuta SATOH
2013-05-16 11:17 Yuta SATOH
2013-06-04 11:11 Yuta SATOH
2013-06-18 12:57 Yuta SATOH
2013-06-20 12:20 Yuta SATOH
2013-06-20 15:30 Yuta SATOH
2013-06-20 15:30 Yuta SATOH
2013-06-28 13:36 Yuta SATOH
2013-07-05 11:12 Yuta SATOH
2013-07-23 12:44 Yuta SATOH
2013-07-27 12:39 Yuta SATOH
2013-08-30 18:30 Yuta SATOH
2013-08-31 16:01 Yuta SATOH
2013-09-16 13:14 Yuta SATOH
2013-09-22 12:41 Yuta SATOH
2013-09-29 14:43 Yuta SATOH
2013-09-29 14:43 Yuta SATOH
2013-10-22 14:14 Yuta SATOH
2013-10-28 14:12 Yuta SATOH
2013-12-19 11:17 Yuta SATOH
2014-01-25 12:51 Yuta SATOH
2014-05-11 9:57 Yuta SATOH
2014-07-13 3:14 Yuta SATOH
2014-08-31 5:07 Yuta SATOH
2014-08-31 5:07 Yuta SATOH
2014-08-31 5:07 Yuta SATOH
2014-09-13 7:20 Yuta SATOH
2014-12-12 14:30 Yuta SATOH
2015-02-23 12:23 Yuta SATOH
2016-10-09 8:28 Yuta SATOH
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=1343391375.6e0525faaf5ef16ebd447148bf05d78b9ce1836b.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