diff options
| author |   Seemant Kulleen <seemant@gentoo.org> | 2003-09-16 23:35:45 +0000 |
|---|---|---|
| committer | Seemant Kulleen <seemant@gentoo.org> | 2003-09-16 23:35:45 +0000 |
| commit | 149d5061fd54428bf8ade63fe381ff72053b15d7 (patch) | |
| tree | 788a0b162cca7dd39e7ed06eb1473a7a43b0ad21 /dev-db/mysql++ | |
| parent | fixed MY_P for good with a little bashfu. thanks spyderous! (diff) | |
| download | historical-149d5061fd54428bf8ade63fe381ff72053b15d7.tar.gz historical-149d5061fd54428bf8ade63fe381ff72053b15d7.tar.bz2 historical-149d5061fd54428bf8ade63fe381ff72053b15d7.zip | |
gcc-3.3 fix
Diffstat (limited to 'dev-db/mysql++')
| -rw-r--r-- | dev-db/mysql++/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-db/mysql++/Manifest | 8 | ||||
| -rw-r--r-- | dev-db/mysql++/mysql++-1.7.9-r2.ebuild | 40 |
3 files changed, 30 insertions, 23 deletions
diff --git a/dev-db/mysql++/ChangeLog b/dev-db/mysql++/ChangeLog index 47b9e55039b1..b02d46c00a5e 100644 --- a/dev-db/mysql++/ChangeLog +++ b/dev-db/mysql++/ChangeLog @@ -1,6 +1,9 @@ # 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.11 2003/08/18 04:37:58 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/ChangeLog,v 1.12 2003/09/16 23:35:44 seemant Exp $ + + 16 Sep 2003; Seemant Kulleen <seemant@gentoo.org> mysql++-1.7.9-r2.ebuild: + compiles on gcc-3.3 now *mysql++-1.7.9-r2 (17 Aug 2003) diff --git a/dev-db/mysql++/Manifest b/dev-db/mysql++/Manifest index a58dc83fdd07..c451db346210 100644 --- a/dev-db/mysql++/Manifest +++ b/dev-db/mysql++/Manifest @@ -1,11 +1,11 @@ -MD5 1cb611f4f9e44f30abcd09f21189580c ChangeLog 2107 MD5 6154ab6c1f3771516819532c42ce5f76 mysql++-1.7.9.ebuild 1413 +MD5 776fafe694c69df988f77b5e66645075 mysql++-1.7.9-r2.ebuild 3532 MD5 f6147a202d91b801a49dd426127c00fc mysql++-1.7.9-r1.ebuild 2726 -MD5 020f842f7c02aaac1b9a76aa3ebb809b mysql++-1.7.9-r2.ebuild 3376 -MD5 7a4351e2de9702b6fd505ea61e4eb899 files/digest-mysql++-1.7.9 133 +MD5 dc86429288b0e7e40f7506630549bb64 ChangeLog 2211 MD5 29dd283bdc19e7542a9f50501d4eda70 files/mysql++-1.7.9_example.patch 1203 -MD5 083796fbc1e79084808389a6e8237dc1 files/digest-mysql++-1.7.9-r1 200 MD5 027947f703cc541c6b056955cf5606be files/mysql++-1.7.9-gcc_throw.patch 7310 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 +MD5 083796fbc1e79084808389a6e8237dc1 files/digest-mysql++-1.7.9-r1 200 MD5 13b4cad28b5dfaa0f580276962effada files/digest-mysql++-1.7.9-r2 397 diff --git a/dev-db/mysql++/mysql++-1.7.9-r2.ebuild b/dev-db/mysql++/mysql++-1.7.9-r2.ebuild index 97ed99f351b1..a9a9731b2113 100644 --- a/dev-db/mysql++/mysql++-1.7.9-r2.ebuild +++ b/dev-db/mysql++/mysql++-1.7.9-r2.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++-1.7.9-r2.ebuild,v 1.2 2003/09/06 22:25:50 msterret Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/mysql++-1.7.9-r2.ebuild,v 1.3 2003/09/16 23:35:44 seemant Exp $ inherit gcc eutils @@ -27,28 +27,32 @@ 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 + 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 - 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 + # 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 + fi #epatch ${FILESDIR}/mysql++-1.7.9-mysql4-gcc3.patch else EPATCH_SINGLE_MSG="Patch for const char* error" \ |