summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Wever <weeve@gentoo.org>2003-10-06 23:51:38 +0000
committerJason Wever <weeve@gentoo.org>2003-10-06 23:51:38 +0000
commit739fd75729427ad7eef1ab3305f09ff68b91879a (patch)
tree1ca3e366e4d34a96f0c3b1853eb2e06a279ef4f8 /dev-lang
parentlooks like gnome-libs is also necessary for gtk interface to work (diff)
downloadgentoo-2-739fd75729427ad7eef1ab3305f09ff68b91879a.tar.gz
gentoo-2-739fd75729427ad7eef1ab3305f09ff68b91879a.tar.bz2
gentoo-2-739fd75729427ad7eef1ab3305f09ff68b91879a.zip
Fixed up sparc specific parts as the patch is no longer needed in the new rev, but the -host arg is.
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/ocaml/ChangeLog6
-rw-r--r--dev-lang/ocaml/Manifest14
-rw-r--r--dev-lang/ocaml/ocaml-3.07.ebuild16
3 files changed, 18 insertions, 18 deletions
diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog
index 51c07ec36731..220594a8fce2 100644
--- a/dev-lang/ocaml/ChangeLog
+++ b/dev-lang/ocaml/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-lang/ocaml
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.16 2003/10/06 21:30:39 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.17 2003/10/06 23:51:34 weeve Exp $
+
+ 06 Oct 2003; Jason Wever <weeve@gentoo.org> ocaml-3.07.ebuild:
+ Fixed up sparc specific parts as the patch is no longer needed in the new rev,
+ but the -host arg is.
*ocaml-3.07 (06 Oct 2003)
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index a0754665b5b3..5fb3d5d3bbe1 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -1,14 +1,14 @@
+MD5 d8116c4adaefc533aa9bdee23a1ee1ab ChangeLog 3779
+MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
MD5 8143dd48dfed3a4e3213352b958c77af ocaml-3.06-r1.ebuild 1444
+MD5 c50e8173b3a6104df726f87a39ba5f62 ocaml-3.06-r2.ebuild 1556
MD5 e85fd8053cc693729f0740b2ac855a44 ocaml-3.06.ebuild 1377
MD5 c850861736892791084d5b2476b2fdc0 ocaml-3.07_beta2.ebuild 1566
-MD5 c50e8173b3a6104df726f87a39ba5f62 ocaml-3.06-r2.ebuild 1556
-MD5 a5b6568ba66135bdb8c65294b84843ec ocaml-3.07.ebuild 1495
-MD5 f5387e732d843b9e4399cc8683a64615 ChangeLog 3609
-MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
-MD5 4df214d6cd74b3c5955d868879dd6cc7 files/ocaml-3.06-tcltk-8.4compat-patch.bz2 639
+MD5 68e9dd97163c9b83143ecb2e06b2e889 ocaml-3.07.ebuild 1365
+MD5 30ac0d14e37ff0be57927d84e4e7e1c6 files/digest-ocaml-3.06 197
MD5 13c4abf06e236e8835011a387f90ecc9 files/digest-ocaml-3.06-r1 63
MD5 13c4abf06e236e8835011a387f90ecc9 files/digest-ocaml-3.06-r2 63
MD5 775d7436073205d935d3979a326b0729 files/digest-ocaml-3.07_beta2 68
-MD5 30ac0d14e37ff0be57927d84e4e7e1c6 files/digest-ocaml-3.06 197
-MD5 6e02dcc33419f9e035b77ff4a0104e8b files/digest-ocaml-3.07 63
MD5 91579cecf8659312c2324d8d40709433 files/ocaml-3.06-sparc-configure.patch 1660
+MD5 4df214d6cd74b3c5955d868879dd6cc7 files/ocaml-3.06-tcltk-8.4compat-patch.bz2 639
+MD5 6e02dcc33419f9e035b77ff4a0104e8b files/digest-ocaml-3.07 63
diff --git a/dev-lang/ocaml/ocaml-3.07.ebuild b/dev-lang/ocaml/ocaml-3.07.ebuild
index 5110f2c2791b..4ede1ea9972c 100644
--- a/dev-lang/ocaml/ocaml-3.07.ebuild
+++ b/dev-lang/ocaml/ocaml-3.07.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.07.ebuild,v 1.1 2003/10/06 21:26:56 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.07.ebuild,v 1.2 2003/10/06 23:51:34 weeve Exp $
inherit flag-o-matic eutils
filter-flags "-fstack-protector"
@@ -22,21 +22,17 @@ src_unpack() {
unpack ${A}
cd ${S}
grep -rle "head -1" . | xargs sed -i "s:head -1:head -n 1:g"
-
- # Fix for bug #23767
- if [ "${ARCH}" = "sparc" ]
- then
- # We need a patch and to make sure it builds
- # for the right host type
- epatch ${FILESDIR}/ocaml-3.06-sparc-configure.patch
- myconf="${myconfg} -host sparc-unknown-linux-gnu"
- fi
}
src_compile() {
local myconf
use tcltk || myconf="-no-tk"
+ # Fix for bug #23767.
+ if [ "${ARCH}" = "sparc" ]; then
+ myconf="${myconf} -host sparc-unknown-linux-gnu"
+ fi
+
./configure -prefix /usr \
-bindir /usr/bin \
-libdir /usr/lib/ocaml \