diff options
| author |   Herbie Hopkins <herbs@gentoo.org> | 2005-11-24 00:55:05 +0000 |
|---|---|---|
| committer | Herbie Hopkins <herbs@gentoo.org> | 2005-11-24 00:55:05 +0000 |
| commit | 40f75bfb8850165de747f2244b3fc2c4b670a7e8 (patch) | |
| tree | 1fc5465c32957c4d71f917b34423b12bf298bb5d /dev-db/mysql | |
| parent | Fix package to be able to build with multilib-strict on amd64. Closes bug #11... (diff) | |
| download | gentoo-2-40f75bfb8850165de747f2244b3fc2c4b670a7e8.tar.gz gentoo-2-40f75bfb8850165de747f2244b3fc2c4b670a7e8.tar.bz2 gentoo-2-40f75bfb8850165de747f2244b3fc2c4b670a7e8.zip | |
multilib fix
(Portage version: 2.0.53_rc7)
Diffstat (limited to 'dev-db/mysql')
| -rw-r--r-- | dev-db/mysql/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-db/mysql/Manifest | 4 | ||||
| -rw-r--r-- | dev-db/mysql/mysql-5.0.16-r2.ebuild | 6 | ||||
| -rw-r--r-- | dev-db/mysql/mysql-5.0.16-r30.ebuild | 6 |
4 files changed, 17 insertions, 5 deletions
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog index 2666f197b859..f3c5d34d6ce7 100644 --- a/dev-db/mysql/ChangeLog +++ b/dev-db/mysql/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/mysql # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.266 2005/11/23 19:44:22 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.267 2005/11/24 00:55:05 herbs Exp $ + + 24 Nov 2005; Herbie Hopkins <herbs@gentoo.org> mysql-5.0.16-r2.ebuild, + mysql-5.0.16-r30.ebuild: + Fix small multilib problem (only occurs on no-symlinks profile) *mysql-5.0.16-r2 (23 Nov 2005) diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest index 159d5467b697..a46033877ac1 100644 --- a/dev-db/mysql/Manifest +++ b/dev-db/mysql/Manifest @@ -27,5 +27,5 @@ MD5 432e8894444e71bc477ef7a68ce5d819 mysql-4.1.14.ebuild 18859 MD5 767951c93752fe52f33984b3cfa8220a mysql-4.1.15-r30.ebuild 22453 MD5 3d68365651cc7d8a0eedccda80ae5bd8 mysql-4.1.15.ebuild 22508 MD5 ed292dce42e38a400c1f274b65c25296 mysql-5.0.15.ebuild 19008 -MD5 56222c53e6663e803bb9b5d2bce33a72 mysql-5.0.16-r2.ebuild 21938 -MD5 114777e0dfbf33d756de4c2ccfed46cd mysql-5.0.16-r30.ebuild 22512 +MD5 4820c4760b892368efc989fbc58764c2 mysql-5.0.16-r2.ebuild 22066 +MD5 9ab39b1f5f21c477ad2003d711c41d9d mysql-5.0.16-r30.ebuild 22640 diff --git a/dev-db/mysql/mysql-5.0.16-r2.ebuild b/dev-db/mysql/mysql-5.0.16-r2.ebuild index 8e9b95b28cf6..9f30e1ca1a28 100644 --- a/dev-db/mysql/mysql-5.0.16-r2.ebuild +++ b/dev-db/mysql/mysql-5.0.16-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.16-r2.ebuild,v 1.1 2005/11/23 19:44:22 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.16-r2.ebuild,v 1.2 2005/11/24 00:55:05 herbs Exp $ # helper function, version (integer) may have section separated by dots # for readbility @@ -220,6 +220,10 @@ src_unpack() { sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in" rm -f scripts/mysqlbug + # Multilib issue with zlib detection + sed -i -e "s:zlib_dir/lib:zlib_dir/$(get_libdir):g" \ + "${S}/config/ac-macros/zlib.m4" + # Make charsets install in the right place find . -name 'Makefile.am' \ -exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \; diff --git a/dev-db/mysql/mysql-5.0.16-r30.ebuild b/dev-db/mysql/mysql-5.0.16-r30.ebuild index d18910b9cfb2..f8270da519a0 100644 --- a/dev-db/mysql/mysql-5.0.16-r30.ebuild +++ b/dev-db/mysql/mysql-5.0.16-r30.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.16-r30.ebuild,v 1.2 2005/11/23 19:44:22 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.16-r30.ebuild,v 1.3 2005/11/24 00:55:05 herbs Exp $ # helper function, version (integer) may have section separated by dots # for readbility @@ -218,6 +218,10 @@ src_unpack() { sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in" rm -f scripts/mysqlbug + # Multilib issue with zlib detection + sed -i -e "s:zlib_dir/lib:zlib_dir/$(get_libdir):g" \ + "${S}/config/ac-macros/zlib.m4" + # Make charsets install in the right place find . -name 'Makefile.am' \ -exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \; |