diff options
| author |   Josh Glover <jmglov@gentoo.org> | 2004-06-23 11:55:14 +0000 |
|---|---|---|
| committer | Josh Glover <jmglov@gentoo.org> | 2004-06-23 11:55:14 +0000 |
| commit | d8544587b965189e30637dc8016545f8e3d8fd9d (patch) | |
| tree | 0299457eda9afbb61aaf26b1ce24bc2d56298484 /dev-libs | |
| parent | Version bump; submitted by M3Dlor in bug #47889 (Manifest recommit) (diff) | |
| download | gentoo-2-d8544587b965189e30637dc8016545f8e3d8fd9d.tar.gz gentoo-2-d8544587b965189e30637dc8016545f8e3d8fd9d.tar.bz2 gentoo-2-d8544587b965189e30637dc8016545f8e3d8fd9d.zip | |
Fixed bug in ebuild that was preventing emerges; submitted by Josh Glover in bug #35679
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/libsqlora8/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-libs/libsqlora8/libsqlora8-2.2.11.ebuild | 23 | ||||
| -rw-r--r-- | dev-libs/libsqlora8/metadata.xml | 7 |
3 files changed, 20 insertions, 17 deletions
diff --git a/dev-libs/libsqlora8/ChangeLog b/dev-libs/libsqlora8/ChangeLog index 836841a95d5b..4945ed7b2336 100644 --- a/dev-libs/libsqlora8/ChangeLog +++ b/dev-libs/libsqlora8/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/libsqlora8 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsqlora8/ChangeLog,v 1.1 2004/02/13 02:50:48 rizzo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsqlora8/ChangeLog,v 1.2 2004/06/23 11:55:14 jmglov Exp $ + + 23 Jun 2004; Josh Glover <jmglov@gentoo.org> libsqlora8-2.2.11.ebuild, + metadata.xml: + Fixed bug in ebuild that was preventing emerges; submitted by Josh Glover in + bug #35679 *libsqlora8-2.2.11 (12 Feb 2004) diff --git a/dev-libs/libsqlora8/libsqlora8-2.2.11.ebuild b/dev-libs/libsqlora8/libsqlora8-2.2.11.ebuild index dd5b606691f8..d297286039b4 100644 --- a/dev-libs/libsqlora8/libsqlora8-2.2.11.ebuild +++ b/dev-libs/libsqlora8/libsqlora8-2.2.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsqlora8/libsqlora8-2.2.11.ebuild,v 1.1 2004/02/13 02:50:48 rizzo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsqlora8/libsqlora8-2.2.11.ebuild,v 1.2 2004/06/23 11:55:14 jmglov Exp $ IUSE="pthreads orathreads" @@ -24,39 +24,38 @@ pkg_setup() { fi # Make sure ORACLE_HOME is set - if [ -z $ORACLE_HOME ]; then + if [ -z "${ORACLE_HOME}" ]; then eerror eerror 'libsqlora8 requires that the ORACLE_HOME environment variable be set.' eerror 'Try: "export ORACLE_HOME=/usr/local/oracle" if you do not know what to do.' eerror die 'ORACLE_HOME not set, see above' fi +} + +src_compile() { + local myconf; # Add $ORACLE_HOME/lib to LD_LIBRARY_PATH - if [ -z $LD_LIBRARY_PATH ]; then - LD_LIBRARY_PATH=$ORACLE_HOME/lib + if [ -z "${LD_LIBRARY_PATH}" ]; then + LD_LIBRARY_PATH=${ORACLE_HOME}/lib else - LD_LIBRARY_PATH=$ORACLE_HOME/lib:$LD_LIBRARY_PATH + LD_LIBRARY_PATH=${ORACLE_HOME}/lib:${LD_LIBRARY_PATH} fi - export LD_LIBRARY_PATH -} -src_compile() { - local myconf; + export LD_LIBRARY_PATH use pthreads && myconf="--with-threads=posix" use orathreads && myconf="--with-threads=oracle" # Build - econf $myconf || die "configure failed" + econf ${myconf} || die "configure failed" emake - #make "DESTDIR=${D}" "docdir=${D}/usr/share/doc/${P}" || die "make failed" } src_install () { einstall dodoc COPYING ChangeLog INSTALL NEWS NEWS-2.2 - #mv ${D}/usr/share/doc/packages/${PN} ${D}/usr/share/doc/${P} # TODO # Copy contents of doc and examples directory to doc diff --git a/dev-libs/libsqlora8/metadata.xml b/dev-libs/libsqlora8/metadata.xml index 2388487e1d87..f412d6f193b5 100644 --- a/dev-libs/libsqlora8/metadata.xml +++ b/dev-libs/libsqlora8/metadata.xml @@ -3,9 +3,8 @@ <pkgmetadata> <herd>no-herd</herd> <maintainer> - <email>rizzo@gentoo.org</email> -<!-- <name>Full name</name> --> -<!-- <description>Description of the maintainership</description> --> + <email>jmglov@gentoo.org</email> + <name>Josh Glover</name> </maintainer> -<!-- <longdescription>Long description of the package</longdescription> --> +<longdescription>libsqlora8 is simple C-library to access Oracle databases via the OCI interface. Makes simple programming tasks much easier than with plain OCI.</longdescription> </pkgmetadata> |