diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2004-05-04 05:12:23 +0000 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2004-05-04 05:12:23 +0000 |
commit | d21f319a419c276709dbb55418be8c9b2172e7ee (patch) | |
tree | 85d71c914dc9c7feb04f69992d94d456ea732367 /dev-db/mysql++ | |
parent | Added IUSE. (Manifest recommit) (diff) | |
download | gentoo-2-d21f319a419c276709dbb55418be8c9b2172e7ee.tar.gz gentoo-2-d21f319a419c276709dbb55418be8c9b2172e7ee.tar.bz2 gentoo-2-d21f319a419c276709dbb55418be8c9b2172e7ee.zip |
patch for gcc3.3.3, bug #49590.
Diffstat (limited to 'dev-db/mysql++')
-rw-r--r-- | dev-db/mysql++/ChangeLog | 8 | ||||
-rw-r--r-- | dev-db/mysql++/Manifest | 13 | ||||
-rw-r--r-- | dev-db/mysql++/files/digest-mysql++-1.7.9-r4 | 6 | ||||
-rw-r--r-- | dev-db/mysql++/files/mysql++-1.7.9_gcc333.patch | 19 | ||||
-rw-r--r-- | dev-db/mysql++/mysql++-1.7.9-r4.ebuild | 105 |
5 files changed, 145 insertions, 6 deletions
diff --git a/dev-db/mysql++/ChangeLog b/dev-db/mysql++/ChangeLog index 3903c26f9217..deb096608f32 100644 --- a/dev-db/mysql++/ChangeLog +++ b/dev-db/mysql++/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-db/mysql++ # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/ChangeLog,v 1.15 2004/04/25 23:37:13 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/ChangeLog,v 1.16 2004/05/04 05:12:23 robbat2 Exp $ + +*mysql++-1.7.9-r4 (03 May 2004) + + 03 May 2004; Robin H. Johnson <robbat2@gentoo.org> mysql++-1.7.9-r4.ebuild, + files/mysql++-1.7.9_gcc333.patch: + patch for gcc3.3.3, bug #49590. 25 Apr 2004; Aron Griffis <agriffis@gentoo.org> mysql++-1.7.9-r1.ebuild, mysql++-1.7.9-r2.ebuild, mysql++-1.7.9-r3.ebuild: diff --git a/dev-db/mysql++/Manifest b/dev-db/mysql++/Manifest index 1ef18cbc87e4..d019eca629df 100644 --- a/dev-db/mysql++/Manifest +++ b/dev-db/mysql++/Manifest @@ -1,10 +1,12 @@ -MD5 6cce77be405ee5d19aae8619d719e330 mysql++-1.7.9.ebuild 1414 -MD5 074016ffbf08927febdf4bad73414cbf mysql++-1.7.9-r2.ebuild 3550 -MD5 9c45a54e52d6144ec76e061939440dc6 mysql++-1.7.9-r1.ebuild 2744 -MD5 bd322b02e651c7d66bcd3859ea42c144 ChangeLog 2714 -MD5 f07098e94790b886b8a36410812f0d61 mysql++-1.7.9-r3.ebuild 3708 +MD5 b880485b6169b2a58a9c5f76da5bfc17 mysql++-1.7.9.ebuild 1413 +MD5 86a7af46292ac5a88c7bf0c767b78590 mysql++-1.7.9-r2.ebuild 3549 +MD5 981c7e7b04d43919f89e8872b7cb21e8 mysql++-1.7.9-r4.ebuild 3857 +MD5 2422f0671c3cb4036c7775cb419db11a mysql++-1.7.9-r1.ebuild 2743 +MD5 875014a8ae4c869d43073c60671e040a ChangeLog 2895 +MD5 e5b552e65d779b78a008bd5a19eb2c18 mysql++-1.7.9-r3.ebuild 3707 MD5 29dd283bdc19e7542a9f50501d4eda70 files/mysql++-1.7.9_example.patch 1203 MD5 027947f703cc541c6b056955cf5606be files/mysql++-1.7.9-gcc_throw.patch 7310 +MD5 526598f80750489676ac49881bba7a69 files/mysql++-1.7.9_gcc333.patch 1047 MD5 54b8d3ba432ce4cad6c23fa32ac17042 files/mysql++-1.7.9-mysql4-gcc295.patch 421 MD5 7a4351e2de9702b6fd505ea61e4eb899 files/digest-mysql++-1.7.9 133 MD5 229dd0f10e6cee31e2f93df59b5f6742 files/mysql++-1.7.9-mysql4-gcc3.patch 426 @@ -12,3 +14,4 @@ MD5 5ac32002d3e432c050e274928b7a1d78 files/mysql++-1.7.9-missing.patch 2922 MD5 083796fbc1e79084808389a6e8237dc1 files/digest-mysql++-1.7.9-r1 200 MD5 13b4cad28b5dfaa0f580276962effada files/digest-mysql++-1.7.9-r2 397 MD5 13b4cad28b5dfaa0f580276962effada files/digest-mysql++-1.7.9-r3 397 +MD5 13b4cad28b5dfaa0f580276962effada files/digest-mysql++-1.7.9-r4 397 diff --git a/dev-db/mysql++/files/digest-mysql++-1.7.9-r4 b/dev-db/mysql++/files/digest-mysql++-1.7.9-r4 new file mode 100644 index 000000000000..350f469fb3e5 --- /dev/null +++ b/dev-db/mysql++/files/digest-mysql++-1.7.9-r4 @@ -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++/files/mysql++-1.7.9_gcc333.patch b/dev-db/mysql++/files/mysql++-1.7.9_gcc333.patch new file mode 100644 index 000000000000..5917847c3193 --- /dev/null +++ b/dev-db/mysql++/files/mysql++-1.7.9_gcc333.patch @@ -0,0 +1,19 @@ +*** mysql++-1.7.9/sqlplusint/type_info1.hh Sat May 19 20:44:48 2001 +--- mysql++-1.7.9-patched/sqlplusint/type_info1.hh Sat May 1 16:08:18 2004 +*************** +*** 28,34 **** + const bool _default; + mysql_ti_sql_type_info (const mysql_ti_sql_type_info &b); // can't do + mysql_ti_sql_type_info& operator=(const mysql_ti_sql_type_info &b); // " " +! mysql_ti_sql_type_info () {} + // OEP - didn't init _base_type and _default mysql_ti_sql_type_info () {} + // all private, only mysql_type_info can + // create because there *must* be only one copy +--- 28,34 ---- + const bool _default; + mysql_ti_sql_type_info (const mysql_ti_sql_type_info &b); // can't do + mysql_ti_sql_type_info& operator=(const mysql_ti_sql_type_info &b); // " " +! mysql_ti_sql_type_info : _base_type(0), _default(false) () {} + // OEP - didn't init _base_type and _default mysql_ti_sql_type_info () {} + // all private, only mysql_type_info can + // create because there *must* be only one copy diff --git a/dev-db/mysql++/mysql++-1.7.9-r4.ebuild b/dev-db/mysql++/mysql++-1.7.9-r4.ebuild new file mode 100644 index 000000000000..300036e2d683 --- /dev/null +++ b/dev-db/mysql++/mysql++-1.7.9-r4.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2004 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-r4.ebuild,v 1.1 2004/05/04 05:12:23 robbat2 Exp $ + +inherit gcc eutils gnuconfig + +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 ~sparc ~ppc ~amd64" + +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 + if [ `gcc-minor-version` -ne 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 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 + # Doesn't work for gcc-3.3 + 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" \ + elif [ `gcc-minor-version` -eq 3 ]; then + mv ${S}/sqlplusint/Makefile.in ${S}/sqlplusint/Makefile.in.old + EPATCH_SINGLE_MSG="Patching for gcc 3.3..." \ + epatch ${DISTDIR}/patch_gcc_3.3.gz + if [ `gcc-micro-version` -eq 3 ]; then + EPATCH_SINGLE_MSG="Patching for gcc 3.3.3..." \ + epatch ${FILESDIR}/mysql++-1.7.9_gcc333.patch + fi + fi + #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 + + # add undef_short to list of include files for installation + epatch ${FILESDIR}/mysql++-1.7.9-missing.patch +} + +src_compile() { + use amd64 && gnuconfig_update + 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++ || die "econf failed" + + 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++" +} |