diff options
| author |   Aron Griffis <agriffis@gentoo.org> | 2004-04-26 01:51:54 +0000 |
|---|---|---|
| committer | Aron Griffis <agriffis@gentoo.org> | 2004-04-26 01:51:54 +0000 |
| commit | e1abfb6688f4e19354c2afaa66217ea8c9f61568 (patch) | |
| tree | b16b0abe1e5323a68d586ca48cb3e913d0166be1 /dev-util/global | |
| parent | ~amd64 (diff) | |
| download | historical-e1abfb6688f4e19354c2afaa66217ea8c9f61568.tar.gz historical-e1abfb6688f4e19354c2afaa66217ea8c9f61568.tar.bz2 historical-e1abfb6688f4e19354c2afaa66217ea8c9f61568.zip | |
Add die following econf for bug 48950
Diffstat (limited to 'dev-util/global')
| -rw-r--r-- | dev-util/global/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-util/global/Manifest | 6 | ||||
| -rw-r--r-- | dev-util/global/global-4.6.1.ebuild | 19 |
3 files changed, 15 insertions, 15 deletions
diff --git a/dev-util/global/ChangeLog b/dev-util/global/ChangeLog index 9c3be6325638..a850f372fc70 100644 --- a/dev-util/global/ChangeLog +++ b/dev-util/global/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-util/global # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/global/ChangeLog,v 1.5 2004/03/13 01:43:18 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/global/ChangeLog,v 1.6 2004/04/26 01:51:54 agriffis Exp $ + + 25 Apr 2004; Aron Griffis <agriffis@gentoo.org> global-4.6.1.ebuild: + Add die following econf for bug 48950 12 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> global-4.5.3.ebuild, global-4.5.ebuild, global-4.6.1.ebuild: diff --git a/dev-util/global/Manifest b/dev-util/global/Manifest index 463c7ad13ab1..1456724521a5 100644 --- a/dev-util/global/Manifest +++ b/dev-util/global/Manifest @@ -1,7 +1,7 @@ -MD5 7cb35b9f079e846a7958dd2418d27878 ChangeLog 820 -MD5 e8b4a1a4b3caf91c36d71d19e0eaa53e global-4.5.3.ebuild 1229 MD5 fa4c404cc2c4d016be4dfc1e7a3b9516 global-4.5.ebuild 740 -MD5 473e7559c927fb856be53219ccc1b54c global-4.6.1.ebuild 1091 +MD5 e8b4a1a4b3caf91c36d71d19e0eaa53e global-4.5.3.ebuild 1229 +MD5 d729d380847e2383cc9052e533c5a159 global-4.6.1.ebuild 1082 +MD5 676af1fc1bd1efe54a9b494cf0a9fa6d ChangeLog 931 MD5 0424e6fe5b2cb2d127bb8c2d358c86f0 files/digest-global-4.5 62 MD5 6b8a9a520f090092b0e274d302e6fd63 files/digest-global-4.5.3 64 MD5 c012ade501ea6254b3600c41cebf968d files/digest-global-4.6.1 64 diff --git a/dev-util/global/global-4.6.1.ebuild b/dev-util/global/global-4.6.1.ebuild index 026e40aef740..d8b0a7edd1cc 100644 --- a/dev-util/global/global-4.6.1.ebuild +++ b/dev-util/global/global-4.6.1.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-util/global/global-4.6.1.ebuild,v 1.2 2004/03/13 01:43:18 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/global/global-4.6.1.ebuild,v 1.3 2004/04/26 01:51:54 agriffis Exp $ IUSE="ssl postgres" @@ -17,20 +17,17 @@ DEPEND=">=sys-libs/glibc-2.2 ssl? ( >=dev-libs/openssl-0.9.6-r1 )" src_compile() { + local myconf - # Patch configure to add -lssl when using postgresql and ssl - if [ "`use postgres`" ] && [ "`use ssl`" ] - then - sed -i "s/-lcrypt/-lcrypt -lssl/" configure - fi - - myconf="" - if [ `use postgres` ]; then + if use postgres; then myconf="--with-postgres=/usr" + if use ssl; then + # Patch configure to add -lssl when using postgresql and ssl + sed -i 's/-lcrypt/-lcrypt -lssl/' configure || die 'sed failed' + fi fi - econf ${myconf} || edie - + econf || die "econf failed" emake || die } |