summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2008-11-27 07:35:33 +0000
committerAlexis Ballier <aballier@gentoo.org>2008-11-27 07:35:33 +0000
commit5431a86f19dd76c639fa17ea8fb2d6671db917fb (patch)
tree9bce00b5154aa1d32a97b3f6740740f4b35b30c1 /dev-lang/ocaml
parentVersion bump for Rails 2.2.2 (diff)
downloadhistorical-5431a86f19dd76c639fa17ea8fb2d6671db917fb.tar.gz
historical-5431a86f19dd76c639fa17ea8fb2d6671db917fb.tar.bz2
historical-5431a86f19dd76c639fa17ea8fb2d6671db917fb.zip
Dont try to install native code compiler libs when not building native code, reported by Jeroen Roovers <jer@gentoo.org> in bug #248929
Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.27.5 x86_64
Diffstat (limited to 'dev-lang/ocaml')
-rw-r--r--dev-lang/ocaml/ChangeLog6
-rw-r--r--dev-lang/ocaml/Manifest10
-rw-r--r--dev-lang/ocaml/ocaml-3.11.0_rc1.ebuild5
3 files changed, 13 insertions, 8 deletions
diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog
index 7a2107c1ffbf..efc7f653a383 100644
--- a/dev-lang/ocaml/ChangeLog
+++ b/dev-lang/ocaml/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-lang/ocaml
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.154 2008/11/25 19:12:36 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.155 2008/11/27 07:35:33 aballier Exp $
+
+ 27 Nov 2008; Alexis Ballier <aballier@gentoo.org> ocaml-3.11.0_rc1.ebuild:
+ Dont try to install native code compiler libs when not building native
+ code, reported by Jeroen Roovers <jer@gentoo.org> in bug #248929
*ocaml-3.11.0_rc1 (25 Nov 2008)
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 4df69139adb7..5ec41ef394b5 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -15,13 +15,13 @@ DIST ocaml-3.10.2.tar.bz2 2284860 RMD160 f631230b090dbd9bf9a9f71631cd0347c033cbb
DIST ocaml-3.11.0+rc1.tar.bz2 2354944 RMD160 98b3b30438de241c1323c19b1a442fff2f2e0fc2 SHA1 947dfd7da5401d7cb4166aad45319d8ee2535f4b SHA256 13db6514f465ed377893077b2b8c34c29646edf201c55c56bc4cb42c210188c1
EBUILD ocaml-3.08.4.ebuild 2532 RMD160 4f76d197232320e0450b7c847dc0006c10ff165b SHA1 4ca95ee897d20abb813855194fbd3206baff5813 SHA256 8d0dfe01e1186149e6e545d8227796b6e7976c6d3e6cc04aa8262c3d574ef252
EBUILD ocaml-3.10.2.ebuild 4446 RMD160 79c3b1bfbfccb7ea3823f8d7f36f9b2280392d5a SHA1 43fabdb80ac1ba267f964a39ba07bc8d208d8c5a SHA256 27680e3e8e19e88e1ea35594771fca0494d5d5b69a515e5a738a743963b0949a
-EBUILD ocaml-3.11.0_rc1.ebuild 4185 RMD160 8029a9b668d1548e64dd051b1427109bc32ebab8 SHA1 50e270fc6b7303e993e3f30454aad7b1cd0e2fa6 SHA256 b337d8fff959246da4aa855878e9d8467aa1b40fb8caa2e05f1e343d41c72de4
-MISC ChangeLog 24480 RMD160 04022fa70b37aa677f3885afb4d784520be64239 SHA1 02b12680773d72cf329f31a6a3f145c612b1dfb5 SHA256 2e3b9424b69fea8e058271a7fc205643fa0d7bb0135c1757cd742d4e21492b59
+EBUILD ocaml-3.11.0_rc1.ebuild 4235 RMD160 e29f76bfe5fb2a0a3b12f4e7ff7eebe38b5b2395 SHA1 d61d1160cc9044503d545d0d8418788a7cc16714 SHA256 232c7b61005998e8b26b21ab9a468f305d33c1fa81667a5ce0bc68e1d9b75589
+MISC ChangeLog 24698 RMD160 860cb972e36b8d0af161b1d83ed1f7b6fe6b4b37 SHA1 13fed50dc32dd87adbba627d6281ace7a67eb81f SHA256 713b5e10c07f32a1518905305d79022c352ad234a0f49b82feba243856e8adf9
MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
-iEYEARECAAYFAkksTioACgkQvFcC4BYPU0p/+gCdGBn0RYJikqS6yDf49DxKxbTb
-rosAoMhsFr7OxJ1FNYDazDeCk1/Vi9tX
-=Yh9u
+iEYEARECAAYFAkkuTcsACgkQvFcC4BYPU0pwhACcCUcX90bmj7/6CmDjiqBW6KqN
+LAAAoKu5ILvW2jIndJprwmitdgjtP1qv
+=fKTc
-----END PGP SIGNATURE-----
diff --git a/dev-lang/ocaml/ocaml-3.11.0_rc1.ebuild b/dev-lang/ocaml/ocaml-3.11.0_rc1.ebuild
index 7c79e8393e5c..96ed313ba9b5 100644
--- a/dev-lang/ocaml/ocaml-3.11.0_rc1.ebuild
+++ b/dev-lang/ocaml/ocaml-3.11.0_rc1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.11.0_rc1.ebuild,v 1.1 2008/11/25 19:12:36 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.11.0_rc1.ebuild,v 1.2 2008/11/27 07:35:33 aballier Exp $
inherit flag-o-matic eutils multilib versionator toolchain-funcs
@@ -92,7 +92,8 @@ src_install() {
# Install the compiler libs
dodir /usr/$(get_libdir)/ocaml/compiler-libs
insinto /usr/$(get_libdir)/ocaml/compiler-libs
- doins {utils,typing,parsing}/*.{mli,cmi,cmo,cmx,o}
+ doins {utils,typing,parsing}/*.{mli,cmi,cmo}
+ use ocamlopt && doins {utils,typing,parsing}/*.{cmx,o}
# Symlink the headers to the right place
dodir /usr/include