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 9B4121382C5 for ; Tue, 27 Mar 2018 12:51:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 79EC7E088F; Tue, 27 Mar 2018 12:51:05 +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 4DC9AE088F for ; Tue, 27 Mar 2018 12:51:05 +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 C4091335C63 for ; Tue, 27 Mar 2018 12:51:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 22F75258 for ; Tue, 27 Mar 2018 12:51:02 +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: <1522155038.d3ecd1e5d0d45f9356367f294da2039449436738.grknight@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/myodbc/myodbc-5.3.10-r1.ebuild dev-db/myodbc/myodbc-5.3.10-r2.ebuild X-VCS-Directories: dev-db/myodbc/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: d3ecd1e5d0d45f9356367f294da2039449436738 X-VCS-Branch: master Date: Tue, 27 Mar 2018 12:51:02 +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: 7a9a1d3f-e012-4733-b1aa-8139e5341192 X-Archives-Hash: d64bef95fe18a9aece6bef663cdc0ec1 commit: d3ecd1e5d0d45f9356367f294da2039449436738 Author: Brian Evans gentoo org> AuthorDate: Tue Mar 27 12:50:38 2018 +0000 Commit: Brian Evans gentoo org> CommitDate: Tue Mar 27 12:50:38 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3ecd1e5 dev-db/myodbc: Drop patch that was integrated upstream Closes: https://bugs.gentoo.org/651386 Package-Manager: Portage-2.3.24, Repoman-2.3.6 .../{myodbc-5.3.10-r1.ebuild => myodbc-5.3.10-r2.ebuild} | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/dev-db/myodbc/myodbc-5.3.10-r1.ebuild b/dev-db/myodbc/myodbc-5.3.10-r2.ebuild similarity index 85% rename from dev-db/myodbc/myodbc-5.3.10-r1.ebuild rename to dev-db/myodbc/myodbc-5.3.10-r2.ebuild index 5aeb327fb5b..62d7f9d9034 100644 --- a/dev-db/myodbc/myodbc-5.3.10-r1.ebuild +++ b/dev-db/myodbc/myodbc-5.3.10-r2.ebuild @@ -41,39 +41,25 @@ DRIVER_NAME="${PN}-${SLOT}" PATCHES=( "${FILESDIR}/${MAJOR}-cmake-doc-path.patch" "${FILESDIR}/5.3.10-cxxlinkage.patch" -# "${FILESDIR}/${MAJOR}-mariadb-dynamic-array.patch" - "${FILESDIR}/5.2.7-my_malloc.patch" "${FILESDIR}/5.3.10-mariadb.patch" ) src_prepare() { - # Fix undefined references due to standards change -# append-cflags -std=gnu89 - # Remove Tests sed -i -e "s/ADD_SUBDIRECTORY(test)//" \ "${S}/CMakeLists.txt" # Fix as-needed on the installer binary - echo "TARGET_LINK_LIBRARIES(myodbc-installer odbc)" >> "${S}/installer/CMakeLists.txt" +# echo "TARGET_LINK_LIBRARIES(myodbc-installer odbc)" >> "${S}/installer/CMakeLists.txt" cmake-utils_src_prepare } multilib_src_configure() { -# local clientlib -# for clientlib in "mariadb" "perconaclient" "mysqlclient" "notfound" ; do -# [[ -x "${EPREFIX}/usr/$(get_libdir)/lib${clientlib}.so" ]] && break -# done -# [[ "${clientlib}x" == "notfoundx" ]] && \ -# die "Installed client library name could not be determined" - # MYSQL_CXX_LINKAGE expects "mysql_config --cxxflags" which doesn't exist on MariaDB mycmakeargs+=( -DMYSQL_CXX_LINKAGE=0 -DWITH_UNIXODBC=1 -# -DMYSQLCLIENT_LIB_NAME="${clientlib}" -# -DMYSQLCLIENT_LIB_NAME="mysqlclient" -DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF} -DMYSQL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" -DLIB_SUBDIR="$(get_libdir)/${PN}-${MAJOR}"