From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 876DA1396D0 for ; Fri, 1 Sep 2017 13:45:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CF345E0D33; Fri, 1 Sep 2017 13:45:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9C2E9E0D33 for ; Fri, 1 Sep 2017 13:45:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3AACE33B864 for ; Fri, 1 Sep 2017 13:45:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A95E98A35 for ; Fri, 1 Sep 2017 13:45:34 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1504273516.080a6315580b734e3e79f9420b207b495b4bc693.grknight@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mysql++/, dev-db/mysql++/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/mysql++/files/mysql++-3.2.3-mariadb-10.2.patch dev-db/mysql++/mysql++-3.2.3.ebuild X-VCS-Directories: dev-db/mysql++/ dev-db/mysql++/files/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 080a6315580b734e3e79f9420b207b495b4bc693 X-VCS-Branch: master Date: Fri, 1 Sep 2017 13:45:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 895c46fd-fcc4-46ed-a686-cd6b5299948a X-Archives-Hash: a631bb5c145299656d729774cfacf52f commit: 080a6315580b734e3e79f9420b207b495b4bc693 Author: Brian Evans gentoo org> AuthorDate: Fri Sep 1 13:45:16 2017 +0000 Commit: Brian Evans gentoo org> CommitDate: Fri Sep 1 13:45:16 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=080a6315 dev-db/mysql++: Fix build for Bug 629492 and general build cleanup Installed files are unchanged Package-Manager: Portage-2.3.8, Repoman-2.3.3 .../mysql++/files/mysql++-3.2.3-mariadb-10.2.patch | 31 ++++++++++++++++++++++ dev-db/mysql++/mysql++-3.2.3.ebuild | 18 ++++++++++--- 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/dev-db/mysql++/files/mysql++-3.2.3-mariadb-10.2.patch b/dev-db/mysql++/files/mysql++-3.2.3-mariadb-10.2.patch new file mode 100644 index 00000000000..f461daac2a4 --- /dev/null +++ b/dev-db/mysql++/files/mysql++-3.2.3-mariadb-10.2.patch @@ -0,0 +1,31 @@ +diff -Naur mysql++-3.2.2-ORIG/lib/dbdriver.cpp mysql++-3.2.2/lib/dbdriver.cpp +--- mysql++-3.2.2-ORIG/lib/dbdriver.cpp 2017-07-14 14:56:06.206629443 +0200 ++++ mysql++-3.2.2/lib/dbdriver.cpp 2017-07-14 15:28:34.690826959 +0200 +@@ -257,7 +257,11 @@ + } + + if ((n == 1) && ++#ifdef CLIENT_LONG_PASSWORD + (o >= CLIENT_LONG_PASSWORD) && ++#else ++ (o >= CLIENT_MYSQL) && ++#endif + #if MYSQL_VERSION_ID > 40000 // highest flag value varies by version + (o <= CLIENT_MULTI_RESULTS) + #else +diff -aurN a/lib/common.h b/lib/common.h +--- a/lib/common.h 2016-12-30 18:44:44.000000000 -0500 ++++ b/lib/common.h 2017-09-01 09:12:12.270089396 -0400 +@@ -130,12 +130,6 @@ + #define MYSQLPP_PATH_SEPARATOR '/' + #endif + +-#if defined(MYSQLPP_MYSQL_HEADERS_BURIED) +-# include +-#else +-# include +-#endif +- + namespace mysqlpp { + + /// \brief Alias for 'true', to make code requesting exceptions more diff --git a/dev-db/mysql++/mysql++-3.2.3.ebuild b/dev-db/mysql++/mysql++-3.2.3.ebuild index 01ad02be6ce..7491c26b1fb 100644 --- a/dev-db/mysql++/mysql++-3.2.3.ebuild +++ b/dev-db/mysql++/mysql++-3.2.3.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit eutils +inherit autotools libtool flag-o-matic DESCRIPTION="C++ API interface to the MySQL database" HOMEPAGE="http://tangentsoft.net/mysql++/" @@ -19,16 +19,28 @@ DEPEND="${RDEPEND}" DOCS=( CREDITS.txt HACKERS.txt Wishlist doc/ssqls-pretty ) src_prepare() { + # Bug filed upstream about deprecated std::auto_ptr + append-cxxflags $(test-flags-CXX -Wno-deprecated-declarations) + # Bad symlink for libtool in the archive + rm "${S}/ltmain.sh" || die eapply "${FILESDIR}/${PN}-3.2.1-gold.patch" + eapply "${FILESDIR}/${PN}-3.2.3-mariadb-10.2.patch" eapply_user + _elibtoolize --auto-ltdl --install --copy --force + elibtoolize # Current MySQL libraries are always with threads and slowly being removed sed -i -e "s/mysqlclient_r/mysqlclient/" "${S}/configure" || die rm "${S}/doc/"README-*-RPM.txt || die } src_configure() { - local myconf="--enable-thread-check --with-mysql=${EPREFIX}/usr" - econf ${myconf} + local myconf=( + --enable-thread-check + --with-mysql="${EPREFIX}/usr" + --with-mysql-lib="${EPREFIX}$(mysql_config --variable=pkglibdir)" + --with-mysql-include="${EPREFIX}$(mysql_config --variable=pkgincludedir)" + ) + econf "${myconf[@]}" } src_install() {