Permalink
Browse files

Move the fb303 build into the install phase to get around that retard…

…ed pathing stuff
  • Loading branch information...
1 parent 434b469 commit d61b0fa3f9412ea001fd3dfdd33d9b71359df402 @mgregson committed Feb 1, 2012
Showing with 6 additions and 9 deletions.
  1. +1 −1 dev-libs/thrift/Manifest
  2. +5 −8 dev-libs/thrift/thrift-0.7.0.ebuild
View
@@ -2,6 +2,6 @@ DIST thrift-0.5.0.tar.gz 1822087 RMD160 a89dca0263ccdc6cc08faa7ba1409099922fb6e5
DIST thrift-0.7.0.tar.gz 2248326 RMD160 d9db8ff077347134101cd017e086511c4317b052 SHA1 b8f6877bc75878984355da4efe171ad99ff05b6a SHA256 ca830156f6f1f94e77823eb5db6ff8f532ed5ccb9e913df83d0c3d6c4ddb9009
DIST thrift-0.8.0.tar.gz 2336261 RMD160 bb0e1d2b6d30b70590752a7f9318e14de285c505 SHA1 1d652d7078d9cc70e2a45d3119b13e86ebd446da SHA256 5e280097d88400f5e2db75595a04e1981538e48869cd6915bb9c4831605f0793
EBUILD thrift-0.5.0.ebuild 1485 RMD160 14298b9014704e2ee276ced7581803767c22235c SHA1 cfba2831b8a0d597fbf972b18ef04f705b48983a SHA256 103e770833ec8734673298ae83f5f9e8db20846eaf4ad89bd7a99d1488915ad7
-EBUILD thrift-0.7.0.ebuild 2409 RMD160 50c8e0c201b869c1f74286a54c12c3b5d7d67cd9 SHA1 18383b9ca63827c6a6848805086f9db658c099c4 SHA256 5ab4f58d26e51ce14086070e3705d30733e036cc8d5bb12cf7e42c2e555615d1
+EBUILD thrift-0.7.0.ebuild 2405 RMD160 f93d51e0da33d561869f32510d08ca6aedb18dde SHA1 330bcba767100b969dc9d13513e1c806edee80c6 SHA256 7964c6ebc82165925f5aac55f2cf1a0b7b7d001f4011721b5135153ac0f317ff
EBUILD thrift-0.8.0.ebuild 2288 RMD160 52e623a10276ab0cfd29201345ebf9338d1b4c16 SHA1 f354f8cff3dd51aceb5a0b2dedcdc187c7b862ec SHA256 6bbe33edd835dbdbafcd5db1be3457394acc0ba28a1fb6d3873c8b930425e8f7
EBUILD thrift-9999.ebuild 2288 RMD160 f48a7905e653a4d1a5e45c3adaff232ccc1e86e8 SHA1 96e38f952b438a881f7f7bbc447ed3cef51e01ec SHA256 47bec41c0a73b89009ac5bb8bdc8abf9bb44d0b2d773ef25feaefecc99a1d54f
@@ -78,28 +78,25 @@ src_configure()
then
einfo "Running configure for fb303..."
cd contrib/fb303;
- econf
+ econf --with-thriftpath=/usr
cd -;
fi
}
src_compile()
{
emake || die
- if use fb303
- then
- einfo "Running make for fb303..."
- cd contrib/fb303;
- emake || die
- cd -;
- fi
}
src_install()
{
emake DESTDIR="${D}" install || die
if use fb303
then
+ einfo "Running make for fb303..."
+ cd contrib/fb303;
+ emake || die
+ cd -;
einfo "Running 'make install' for fb303..."
cd contrib/fb303;
emake DESTDIR="${D}" install || die

0 comments on commit d61b0fa

Please sign in to comment.