diff options
| author |   Matthieu Sozeau <mattam@gentoo.org> | 2004-08-18 19:39:28 +0000 |
|---|---|---|
| committer | Matthieu Sozeau <mattam@gentoo.org> | 2004-08-18 19:39:28 +0000 |
| commit | 2b7247d45cef97ec4c9dca5d77c866a19d2bfa64 (patch) | |
| tree | 95da510d157cd12d4d649bce1b30e997c62c388a /dev-lang/ocaml | |
| parent | manifest recommit (Manifest recommit) (diff) | |
| download | gentoo-2-2b7247d45cef97ec4c9dca5d77c866a19d2bfa64.tar.gz gentoo-2-2b7247d45cef97ec4c9dca5d77c866a19d2bfa64.tar.bz2 gentoo-2-2b7247d45cef97ec4c9dca5d77c866a19d2bfa64.zip | |
Add handling of CFLAGS, resolves bug #51593
Diffstat (limited to 'dev-lang/ocaml')
| -rw-r--r-- | dev-lang/ocaml/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/ocaml/ocaml-3.07-r1.ebuild | 12 | ||||
| -rw-r--r-- | dev-lang/ocaml/ocaml-3.08.ebuild | 12 |
3 files changed, 27 insertions, 3 deletions
diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog index 1ffa965662f9..59f292e281a6 100644 --- a/dev-lang/ocaml/ChangeLog +++ b/dev-lang/ocaml/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/ocaml # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.44 2004/08/16 23:33:49 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.45 2004/08/18 19:39:28 mattam Exp $ + + 18 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> ocaml-3.07-r1.ebuild, + ocaml-3.08.ebuild: + Add handling of CFLAGS, use with care! 16 Aug 2004; Guy Martin <gmsoft@gentoo.org> ocaml-3.08.ebuild: Yay, my port to hppa-linux is in the mainstream ! Marking stable ! diff --git a/dev-lang/ocaml/ocaml-3.07-r1.ebuild b/dev-lang/ocaml/ocaml-3.07-r1.ebuild index f793d4298d09..e27fb047f0a6 100644 --- a/dev-lang/ocaml/ocaml-3.07-r1.ebuild +++ b/dev-lang/ocaml/ocaml-3.07-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.07-r1.ebuild,v 1.22 2004/08/14 04:45:52 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.07-r1.ebuild,v 1.23 2004/08/18 19:39:28 mattam Exp $ inherit flag-o-matic eutils @@ -18,6 +18,13 @@ IUSE="tcltk latex" DEPEND="virtual/libc tcltk? ( >=dev-lang/tk-3.3.3 )" +pkg_setup() { + ewarn + ewarn "Building ocaml with unsafe CFLAGS can have unexpected results" + ewarn "Please retry building with safer CFLAGS before reporting bugs" + ewarn +} + src_unpack() { unpack ${P}.tar.gz cd ${S} @@ -46,6 +53,9 @@ src_compile() { -mandir /usr/share/man \ --with-pthread ${myconf} || die + sed -i -e "s/\(BYTECCCOMPOPTS=.*\)/\1 ${CFLAGS}/" config/Makefile + sed -i -e "s/\(NATIVECCCOMPOPTS=.*\)/\1 ${CFLAGS}/" config/Makefile + make world || die make opt || die make opt.opt || die diff --git a/dev-lang/ocaml/ocaml-3.08.ebuild b/dev-lang/ocaml/ocaml-3.08.ebuild index c5106b245b76..3c7ed00ab13e 100644 --- a/dev-lang/ocaml/ocaml-3.08.ebuild +++ b/dev-lang/ocaml/ocaml-3.08.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.08.ebuild,v 1.3 2004/08/16 23:33:49 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.08.ebuild,v 1.4 2004/08/18 19:39:28 mattam Exp $ inherit flag-o-matic eutils @@ -19,6 +19,13 @@ DEPEND="virtual/libc S="${WORKDIR}/${P}.0" +pkg_setup() { + ewarn + ewarn "Building ocaml with unsafe CFLAGS can have unexpected results" + ewarn "Please retry building with safer CFLAGS before reporting bugs" + ewarn +} + src_compile() { filter-flags "-fstack-protector" @@ -39,6 +46,9 @@ src_compile() { -mandir /usr/share/man \ --with-pthread ${myconf} || die + sed -i -e "s/\(BYTECCCOMPOPTS=.*\)/\1 ${CFLAGS}/" config/Makefile + sed -i -e "s/\(NATIVECCCOMPOPTS=.*\)/\1 ${CFLAGS}/" config/Makefile + make world || die make opt || die make opt.opt || die |