diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2003-06-13 01:42:18 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2003-06-13 01:42:18 +0000 |
| commit | 92d332572328d4208b1a53a4f76332c5e981fe4b (patch) | |
| tree | 1d0592c87124174515d067a248705f64d5088115 /dev-db | |
| parent | show an error msg and die for a case of USE mysql doesn't support (diff) | |
| download | gentoo-2-92d332572328d4208b1a53a4f76332c5e981fe4b.tar.gz gentoo-2-92d332572328d4208b1a53a4f76332c5e981fe4b.tar.bz2 gentoo-2-92d332572328d4208b1a53a4f76332c5e981fe4b.zip | |
show an error msg and die for a case of USE mysql doesn't support
Diffstat (limited to 'dev-db')
| -rw-r--r-- | dev-db/mysql/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-db/mysql/Manifest | 5 | ||||
| -rw-r--r-- | dev-db/mysql/mysql-4.0.13-r3.ebuild | 7 |
3 files changed, 13 insertions, 5 deletions
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog index aa800b12d933..2484b30b3fda 100644 --- a/dev-db/mysql/ChangeLog +++ b/dev-db/mysql/ChangeLog @@ -1,9 +1,13 @@ # ChangeLog for dev-db/mysql # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.53 2003/06/12 21:21:21 rac Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.54 2003/06/13 01:42:16 robbat2 Exp $ *mysql-4.0.13-r3 (12 Jun 2003) + 12 Jun 2003; <robbat2@gentoo.org> mysql-4.0.13-r3.ebuild: + Show a sensible error message and die if the user has USE="static ssl" as + MySQLv4 doesn't support these simultanoeusly. + 12 Jun 2003; <rac@gentoo.org> mysql-4.0.13-r3.ebuild, files/mysql-4.0.13-thrssl.patch: Attempt to make libmysqlclient_r.so link with -lssl diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest index 39ab3276a3bc..ab876d427329 100644 --- a/dev-db/mysql/Manifest +++ b/dev-db/mysql/Manifest @@ -1,12 +1,11 @@ MD5 873cd30ebb693aa7732628e8d0e83789 mysql-3.23.56.ebuild 6624 MD5 d95bde38182c7cf31940632ea48d3536 mysql-4.0.12.ebuild 6863 -MD5 adbde399859bbba49bd0f8e21fdc04dc patch 618 MD5 8bd70e5ba5708e31ffc18c0d3fcce1fa mysql-3.23.52-r1.ebuild 5952 MD5 0819a9eff62aada70d80a774ffa440b1 mysql-4.0.13-r2.ebuild 6504 MD5 19a3358517a96512485e9303036706ad mysql-4.0.13.ebuild 6683 MD5 19b75b0d4e2168fa0a84b8bb814e1601 mysql-4.0.13-r1.ebuild 6517 -MD5 2beff3b8530493136f8578624a8ca65b ChangeLog 9032 -MD5 66964d18cdb0906aa43c4d81d46861a4 mysql-4.0.13-r3.ebuild 6981 +MD5 5234f0e6cfde083b46082be53c15106f ChangeLog 9036 +MD5 8c2fe790a0f21b7941eb4528147c7a65 mysql-4.0.13-r3.ebuild 6985 MD5 4541e130a1b0fa90db8612973b0adb75 files/mysql-4.0-mysqld-safe-sh.diff 1477 MD5 36aa23522b241aafdb833ac4f11c4fd1 files/mysql-4.0.4-install-db-sh.diff 1439 MD5 707d18c98dd9d86533b53330a2daadd2 files/mysql-4.0.rc6 951 diff --git a/dev-db/mysql/mysql-4.0.13-r3.ebuild b/dev-db/mysql/mysql-4.0.13-r3.ebuild index c8e9f238bf05..7a712421fc50 100644 --- a/dev-db/mysql/mysql-4.0.13-r3.ebuild +++ b/dev-db/mysql/mysql-4.0.13-r3.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-db/mysql/mysql-4.0.13-r3.ebuild,v 1.2 2003/06/12 21:44:47 rac Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.13-r3.ebuild,v 1.3 2003/06/13 01:42:16 robbat2 Exp $ #to accomodate -laadeedah releases NEWP=${P} @@ -48,6 +48,11 @@ pkg_setup() { } src_unpack() { + if use static && use ssl; then + local msg="MySQL does not support building statically with SSL support" + eerror "${msg}" + die "${msg}" + fi unpack ${A} || die cd ${S} || die #required for qmail-mysql |