diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2003-08-18 04:38:01 +0000 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2003-08-18 04:38:01 +0000 |
commit | 343845beeb49e0f7916527e390e08185f2f6b2ac (patch) | |
tree | 4d341564451a1c8924192d25be5616a7a32745aa /dev-db | |
parent | add latest patches, should fix #23621 (diff) | |
download | historical-343845beeb49e0f7916527e390e08185f2f6b2ac.tar.gz historical-343845beeb49e0f7916527e390e08185f2f6b2ac.tar.bz2 historical-343845beeb49e0f7916527e390e08185f2f6b2ac.zip |
add latest patches, should fix #23621
Diffstat (limited to 'dev-db')
-rw-r--r-- | dev-db/mysql++/Manifest | 6 | ||||
-rw-r--r-- | dev-db/mysql++/files/digest-mysql++-1.7.9-r2 | 6 | ||||
-rw-r--r-- | dev-db/mysql++/mysql++-1.7.9-r2.ebuild | 93 |
3 files changed, 102 insertions, 3 deletions
diff --git a/dev-db/mysql++/Manifest b/dev-db/mysql++/Manifest index 4e5260dcec09..7a7f96620014 100644 --- a/dev-db/mysql++/Manifest +++ b/dev-db/mysql++/Manifest @@ -1,7 +1,7 @@ -MD5 9151937f08894a22ac2038e720501912 mysql++-1.7.9.ebuild 1415 -MD5 7adb273e36dcf1d36991e7751d119402 mysql++-1.7.9-r2.ebuild 3316 +MD5 57d4957b057c55e3c99acc55af446edb mysql++-1.7.9.ebuild 1410 +MD5 8facc128ceb97613eecad6bff363a356 mysql++-1.7.9-r2.ebuild 3377 MD5 c1fe1a7eb033e0ab34bfe0fbd7890b16 mysql++-1.7.9-r1.ebuild 2726 -MD5 2f112639df3527d9702409dc8eb1c20b ChangeLog 1954 +MD5 9d1edbec8f3629fdff0b3a5d950df242 ChangeLog 2106 MD5 29dd283bdc19e7542a9f50501d4eda70 files/mysql++-1.7.9_example.patch 1203 MD5 027947f703cc541c6b056955cf5606be files/mysql++-1.7.9-gcc_throw.patch 7310 MD5 54b8d3ba432ce4cad6c23fa32ac17042 files/mysql++-1.7.9-mysql4-gcc295.patch 421 diff --git a/dev-db/mysql++/files/digest-mysql++-1.7.9-r2 b/dev-db/mysql++/files/digest-mysql++-1.7.9-r2 new file mode 100644 index 000000000000..350f469fb3e5 --- /dev/null +++ b/dev-db/mysql++/files/digest-mysql++-1.7.9-r2 @@ -0,0 +1,6 @@ +MD5 1312fb4e33dcce07fac5fa9c2ac801f7 mysql++-1.7.9.tar.gz 749476 +MD5 118d30c7ffd7e5ad49b78415acaac0bb mysql++-gcc-3.0.patch.gz 21357 +MD5 f7358e00675fde37caa7a4aa1baa48d1 mysql++-gcc-3.2.patch.gz 2451 +MD5 51ae8cfd340cdf4a2d08d04ee3e01296 mysql++-gcc-3.2.2.patch.gz 416 +MD5 c80d705e300b76ab07e10344eb8f19d3 patch_gcc_3.3.gz 19755 +MD5 de17e2c7f20b5bad69ea677ce614a1ca mysqlplus-gcc-3.4.patch.gz 3888 diff --git a/dev-db/mysql++/mysql++-1.7.9-r2.ebuild b/dev-db/mysql++/mysql++-1.7.9-r2.ebuild new file mode 100644 index 000000000000..896e8d113470 --- /dev/null +++ b/dev-db/mysql++/mysql++-1.7.9-r2.ebuild @@ -0,0 +1,93 @@ +# 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++-1.7.9-r2.ebuild,v 1.1 2003/08/18 04:37:58 robbat2 Exp $ + +inherit gcc eutils + +DESCRIPTION="C++ API interface to the MySQL database" +# This is the download page but includes links to other places +HOMEPAGE="http://www.mysql.org/downloads/api-mysql++.html" +SRC_URI_BASE="mirror://mysql/Downloads/${PN}" +SRC_URI=" + ${SRC_URI_BASE}/${P}.tar.gz + ${SRC_URI_BASE}/${PN}-gcc-3.0.patch.gz + ${SRC_URI_BASE}/${PN}-gcc-3.2.patch.gz + ${SRC_URI_BASE}/${PN}-gcc-3.2.2.patch.gz + ${SRC_URI_BASE}/patch_gcc_3.3.gz + ${SRC_URI_BASE}/mysqlplus-gcc-3.4.patch.gz + " + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="x86 ~alpha ~hppa ~mips ~arm ~sparc ~ppc" + +DEPEND=">=dev-db/mysql-3.23.49" + +src_unpack() { + unpack ${P}.tar.gz + EPATCH_OPTS="-p1 -d ${S}" + if [ `gcc-major-version` -eq 3 ] ; then + EPATCH_SINGLE_MSG="Patching for gcc 3.0..." \ + epatch ${DISTDIR}/mysql++-gcc-3.0.patch.gz + if [ `gcc-minor-version` -eq 2 ] ; then + EPATCH_SINGLE_MSG="Patching for gcc 3.2..." \ + epatch ${DISTDIR}/mysql++-gcc-3.2.patch.gz + if [ `gcc-micro-version` -ge 2 ] ; then + EPATCH_SINGLE_MSG="Patching for gcc >=3.2.2..." \ + epatch ${DISTDIR}/mysql++-gcc-3.2.2.patch.gz + fi + elif [ `gcc-minor-version` -eq 3 ] ; then + EPATCH_SINGLE_MSG="Patching for gcc 3.3..." \ + epatch ${DISTDIR}/patch_gcc_3.3.gz + elif [ `gcc-minor-version` -eq 4 ] ; then + EPATCH_SINGLE_MSG="Patching for gcc 3.4 (patch for 3.2 needed first)..." \ + epatch ${DISTDIR}/mysql++-gcc-3.2.patch.gz + EPATCH_SINGLE_MSG="Patching for gcc 3.4..." \ + epatch ${DISTDIR}/mysqlplus-gcc-3.4.patch.gz + fi + EPATCH_SINGLE_MSG="Patching to fix some warnings and errors..." \ + epatch ${FILESDIR}/mysql++-1.7.9-gcc_throw.patch + # This is included in mysql++-gcc-3.2.2.patch.gz + #EPATCH_SINGLE_MSG="Patch for const char* error" \ + #epatch ${FILESDIR}/mysql++-1.7.9-mysql4-gcc3.patch + else + EPATCH_SINGLE_MSG="Patch for const char* error" \ + epatch ${FILESDIR}/mysql++-1.7.9-mysql4-gcc295.patch + fi + EPATCH_SINGLE_MSG="Fixing examples directory bug..." \ + epatch ${FILESDIR}/mysql++-1.7.9_example.patch +} + +src_compile() { + local myconf + # we want C++ exceptions turned on + myconf="--enable-exceptions" + # We do this because of the large number of header files installed to the include directory + # This is a breakage compared to previous versions that installed straight to /usr/include + myconf="${myconf} --includedir=/usr/include/mysql++" + # not including the directives to where MySQL is because it seems to find it + # just fine without + # force the cflags into place otherwise they get totally ignored by configure + CFLAGS="${CFLAGS}" CXXFLAGS="${CFLAGS} ${CXXFLAGS}" \ + econf \ + --enable-exceptions \ + --includedir=/usr/include/mysql++ + + emake || die "unable to make" +} + +src_install() { + make DESTDIR=${D} install || die + # install the docs and HTML pages + dodoc README LGPL + dodoc doc/* + dohtml doc/man-html/* + prepalldocs + ewarn "The MySQL++ include directory has changed compared to previous versions" + ewarn "It was previously /usr/include, but now it is /usr/include/mysql++" +} + +pkg_postinst() { + ewarn "The MySQL++ include directory has changed compared to previous versions" + ewarn "It was previously /usr/include, but now it is /usr/include/mysql++" +} |