* [gentoo-commits] gentoo-x86 commit in eclass: findlib.eclass
@ 2008-02-02 21:10 Petteri Raty (betelgeuse)
0 siblings, 0 replies; 5+ messages in thread
From: Petteri Raty (betelgeuse) @ 2008-02-02 21:10 UTC (permalink / raw
To: gentoo-commits
betelgeuse 08/02/02 21:10:16
Modified: findlib.eclass
Log:
Use die instead of exit.
Revision Changes Path
1.7 eclass/findlib.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/findlib.eclass?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/findlib.eclass?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/findlib.eclass?r1=1.6&r2=1.7
Index: findlib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/findlib.eclass,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- findlib.eclass 2 Feb 2008 21:05:33 -0000 1.6
+++ findlib.eclass 2 Feb 2008 21:10:16 -0000 1.7
@@ -1,9 +1,11 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/findlib.eclass,v 1.6 2008/02/02 21:05:33 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/findlib.eclass,v 1.7 2008/02/02 21:10:16 betelgeuse Exp $
#
-# Origianl author : Matthieu Sozeau <mattam@gentoo.org> (retired)
+# Original author : Matthieu Sozeau <mattam@gentoo.org> (retired)
#
+# Changes: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/findlib.eclass?view=log
+#
# ocamlfind (a.k.a. findlib) eclass
#
@@ -15,9 +17,9 @@
check_ocamlfind() {
if [ ! -x /usr/bin/ocamlfind ]
then
- ewarn "In findlib.eclass: could not find the ocamlfind executable"
- ewarn "Please report this bug on gentoo's bugzilla, assigning to ml@gentoo.org"
- exit 1
+ eerror "In findlib.eclass: could not find the ocamlfind executable"
+ eerror "Please report this bug on gentoo's bugzilla, assigning to ml@gentoo.org"
+ die "ocamlfind executabled not found"
fi
}
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 5+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: findlib.eclass
@ 2011-08-09 19:06 Jeremy Olexa (darkside)
0 siblings, 0 replies; 5+ messages in thread
From: Jeremy Olexa (darkside) @ 2011-08-09 19:06 UTC (permalink / raw
To: gentoo-commits
darkside 11/08/09 19:06:37
Modified: findlib.eclass
Log:
migrate Gentoo Prefix changes
Revision Changes Path
1.10 eclass/findlib.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/findlib.eclass?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/findlib.eclass?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/findlib.eclass?r1=1.9&r2=1.10
Index: findlib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/findlib.eclass,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- findlib.eclass 8 Feb 2009 21:30:12 -0000 1.9
+++ findlib.eclass 9 Aug 2011 19:06:37 -0000 1.10
@@ -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/eclass/findlib.eclass,v 1.9 2009/02/08 21:30:12 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/findlib.eclass,v 1.10 2011/08/09 19:06:37 darkside Exp $
# @ECLASS: findlib.eclass
# @MAINTAINER:
@@ -20,7 +20,7 @@
[[ ${FINDLIB_USE} ]] && DEPEND="${FINDLIB_USE}? ( ${DEPEND} )"
check_ocamlfind() {
- if [ ! -x /usr/bin/ocamlfind ]
+ if [ ! -x "${EPREFIX}"/usr/bin/ocamlfind ]
then
eerror "In findlib.eclass: could not find the ocamlfind executable"
eerror "Please report this bug on gentoo's bugzilla, assigning to ml@gentoo.org"
@@ -34,13 +34,18 @@
# We use the stublibs style, so no ld.conf needs to be
# updated when a package installs C shared libraries.
findlib_src_preinst() {
+ has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
+ has "${EAPI:-0}" 0 1 2 && use !prefix && ED="${D}"
check_ocamlfind
# destdir is the ocaml sitelib
local destdir=`ocamlfind printconf destdir`
+ # strip off prefix
+ destdir=${destdir#${EPREFIX}}
+
dodir ${destdir} || die "dodir failed"
- export OCAMLFIND_DESTDIR=${D}${destdir}
+ export OCAMLFIND_DESTDIR=${ED}${destdir}
# stublibs style
dodir ${destdir}/stublibs || die "dodir failed"
^ permalink raw reply [flat|nested] 5+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: findlib.eclass
@ 2009-02-08 21:30 Markus Meier (maekke)
0 siblings, 0 replies; 5+ messages in thread
From: Markus Meier (maekke) @ 2009-02-08 21:30 UTC (permalink / raw
To: gentoo-commits
maekke 09/02/08 21:30:12
Modified: findlib.eclass
Log:
quote ${D} variable, bug #258163
Revision Changes Path
1.9 eclass/findlib.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/findlib.eclass?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/findlib.eclass?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/findlib.eclass?r1=1.8&r2=1.9
Index: findlib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/findlib.eclass,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- findlib.eclass 24 Feb 2008 15:46:09 -0000 1.8
+++ findlib.eclass 8 Feb 2009 21:30:12 -0000 1.9
@@ -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/eclass/findlib.eclass,v 1.8 2008/02/24 15:46:09 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/findlib.eclass,v 1.9 2009/02/08 21:30:12 maekke Exp $
# @ECLASS: findlib.eclass
# @MAINTAINER:
@@ -52,5 +52,5 @@
# Install with a properly setup findlib
findlib_src_install() {
findlib_src_preinst
- make DESTDIR=${D} "$@" install || die "make failed"
+ make DESTDIR="${D}" "$@" install || die "make failed"
}
^ permalink raw reply [flat|nested] 5+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: findlib.eclass
@ 2008-02-24 15:46 Alexis Ballier (aballier)
0 siblings, 0 replies; 5+ messages in thread
From: Alexis Ballier (aballier) @ 2008-02-24 15:46 UTC (permalink / raw
To: gentoo-commits
aballier 08/02/24 15:46:10
Modified: findlib.eclass
Log:
make findlib eclass ready for eclass manpages, thanks to mren <bugs@rennings.net> in bug #210638
Revision Changes Path
1.8 eclass/findlib.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/findlib.eclass?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/findlib.eclass?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/findlib.eclass?r1=1.7&r2=1.8
Index: findlib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/findlib.eclass,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- findlib.eclass 2 Feb 2008 21:10:16 -0000 1.7
+++ findlib.eclass 24 Feb 2008 15:46:09 -0000 1.8
@@ -1,13 +1,18 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/findlib.eclass,v 1.7 2008/02/02 21:10:16 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/findlib.eclass,v 1.8 2008/02/24 15:46:09 aballier Exp $
+
+# @ECLASS: findlib.eclass
+# @MAINTAINER:
+# ml@gentoo.org
#
# Original author : Matthieu Sozeau <mattam@gentoo.org> (retired)
#
# Changes: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/findlib.eclass?view=log
-#
+# @BLURB: ocamlfind (a.k.a. findlib) eclass
+# @DESCRIPTION:
# ocamlfind (a.k.a. findlib) eclass
-#
+
# From this findlib version there is proper stublibs support.
@@ -23,6 +28,8 @@
fi
}
+# @FUNCTION: findlib_src_preinst
+# @DESCRIPTION:
# Prepare the image for a findlib installation.
# We use the stublibs style, so no ld.conf needs to be
# updated when a package installs C shared libraries.
@@ -40,6 +47,8 @@
export OCAMLFIND_LDCONF=ignore
}
+# @FUNCTION: findlib_src_install
+# @DESCRIPTION:
# Install with a properly setup findlib
findlib_src_install() {
findlib_src_preinst
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 5+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: findlib.eclass
@ 2008-02-02 21:05 Petteri Raty (betelgeuse)
0 siblings, 0 replies; 5+ messages in thread
From: Petteri Raty (betelgeuse) @ 2008-02-02 21:05 UTC (permalink / raw
To: gentoo-commits
betelgeuse 08/02/02 21:05:33
Modified: findlib.eclass
Log:
Make it possible to have the depend conditional via a use flag.
Revision Changes Path
1.6 eclass/findlib.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/findlib.eclass?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/findlib.eclass?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/findlib.eclass?r1=1.5&r2=1.6
Index: findlib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/findlib.eclass,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- findlib.eclass 11 Jul 2005 15:08:06 -0000 1.5
+++ findlib.eclass 2 Feb 2008 21:05:33 -0000 1.6
@@ -1,8 +1,8 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/findlib.eclass,v 1.5 2005/07/11 15:08:06 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/findlib.eclass,v 1.6 2008/02/02 21:05:33 betelgeuse Exp $
#
-# Author : Matthieu Sozeau <mattam@gentoo.org>
+# Origianl author : Matthieu Sozeau <mattam@gentoo.org> (retired)
#
# ocamlfind (a.k.a. findlib) eclass
#
@@ -10,6 +10,7 @@
# From this findlib version there is proper stublibs support.
DEPEND=">=dev-ml/findlib-1.0.4-r1"
+[[ ${FINDLIB_USE} ]] && DEPEND="${FINDLIB_USE}? ( ${DEPEND} )"
check_ocamlfind() {
if [ ! -x /usr/bin/ocamlfind ]
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-08-09 19:06 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-02-02 21:10 [gentoo-commits] gentoo-x86 commit in eclass: findlib.eclass Petteri Raty (betelgeuse)
-- strict thread matches above, loose matches on Subject: below --
2011-08-09 19:06 Jeremy Olexa (darkside)
2009-02-08 21:30 Markus Meier (maekke)
2008-02-24 15:46 Alexis Ballier (aballier)
2008-02-02 21:05 Petteri Raty (betelgeuse)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox