From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8B7C5138D25 for ; Fri, 17 Jul 2015 17:21:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 56746E084D; Fri, 17 Jul 2015 17:21:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BA204E07E1 for ; Fri, 17 Jul 2015 17:21:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CDB74340DC2 for ; Fri, 17 Jul 2015 17:21:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7AB32BA for ; Fri, 17 Jul 2015 17:21:39 +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: <1437151212.154ac5b346502c06c2dddf53ec53399aa58ced4a.grknight@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: dev-db/myodbc/, dev-db/myodbc/files/ X-VCS-Repository: proj/mysql X-VCS-Files: dev-db/myodbc/Manifest dev-db/myodbc/files/5.3.4-cxxlinkage.patch dev-db/myodbc/myodbc-5.3.4.ebuild X-VCS-Directories: dev-db/myodbc/ dev-db/myodbc/files/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 154ac5b346502c06c2dddf53ec53399aa58ced4a X-VCS-Branch: master Date: Fri, 17 Jul 2015 17:21:39 +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: 6ad83626-2948-465c-82ac-b6e1b87e2dd9 X-Archives-Hash: f0af2b5fce9bde1aca626ee5ebaf309c commit: 154ac5b346502c06c2dddf53ec53399aa58ced4a Author: Brian Evans gentoo org> AuthorDate: Fri Jul 17 16:40:12 2015 +0000 Commit: Brian Evans gentoo org> CommitDate: Fri Jul 17 16:40:12 2015 +0000 URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=154ac5b3 Version bump dev-db/myodbc/Manifest | 31 +------- dev-db/myodbc/files/5.3.4-cxxlinkage.patch | 40 ++++++++++ dev-db/myodbc/myodbc-5.3.4.ebuild | 123 +++++++++++++++++++++++++++++ 3 files changed, 164 insertions(+), 30 deletions(-) diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest index c23dddb..809ce4d 100644 --- a/dev-db/myodbc/Manifest +++ b/dev-db/myodbc/Manifest @@ -1,31 +1,2 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX 5.2.7-mariadb-dynamic-array.patch 3053 SHA256 132b49d939fe26939e3c794a1db7dc50f28e552c81db7913006dfee45cb4b503 SHA512 26d35effbf4e74ef634c6e42dced40830402aa0925571f4bd55acd3dfe06f1c8c8f3bab4e9bb4bcd3f72dc87ecc3a093b984df4837548710899f97d8bdeca7b6 WHIRLPOOL a778ec270547a4fd0f7907f7eb5005da966575f77c9c886f545c393e4a21ac58656316202d5bd48cc7523d35e61a97c806564dbf7a7573009780c8c936d502ee -AUX 5.2.7-r1-cxxlinkage.patch 1707 SHA256 323beef3086506a7313507403ff632ac00ab86a082eb71e44bdffd5dc2f176dd SHA512 3d0f1839e1b200d7746d2c7161ee2a85813bf40517a70777d361e482efd6d6b0be88415d339d6dccc49de865a0d714fbbce2b74abb1bbc12c4f4681a5bd5abf8 WHIRLPOOL 2823b2bf237c999ddb0caac94abd7bcd3ec04dda01d3440982d537557aee29f4cf14b464607dcc6681c8b990b87caedc9864a04ebe3fe831bb4e0dab9a1c1e80 -AUX cmake-doc-path.patch 1498 SHA256 75477998ba483fb1f6a5dde6cbd4719ac2e98e32540e7eb46bd334a0b354abe2 SHA512 2e48af11efb55a1508402d5d1d717a3dfc9897bf0ccce5aa190792fb673ac78b27a9480e951a6347a2c8d0e2fe08a28c11fd08c55dbea835a93f525decaaf09e WHIRLPOOL 0631c7cef81bb8541ca0af96afcf9ed8118aef87702d89d5237a8744bc6d9324b6cb148f3c32e4d225df038d15ad5c8583d0a6a49e33e9fc7b9cd44b319982be -AUX odbc.ini.m4 517 SHA256 0f14bd8815aac8c75ff3b2b6e86b2883fbe4e2e6e3de153e772091c7a5c124e5 SHA512 60883bced4be275f9496910ecbf11d92e9d550e28c12eca8549546f3b5f5fd12322fabb81611bb4d951bab6d203ddd82aafe8ec8bdf0b6aa61a94eac6770fb3b WHIRLPOOL 2c12b3565efe6f92f8f43f9de84e667b066f6b82e17590b1c918540becc9554b1224c14f40dfa7c263818089208b7851b2ca6a6f881d77196564b57db49634fe -AUX odbcinst.ini.m4 233 SHA256 893011ec62a2631cf41521717cbebfddf48ae3a633c8ca1e7774f11930fe2537 SHA512 d6a27b1915133e23ab4f16930446e6c623e3636490c1a772a531805d6abbaf8470fa59924f68f01faabf496be7b5f17294fe51a9f940dfa45f03a9abc120f953 WHIRLPOOL e8a10ae834eb97e63ed3dc637f534e556c9e13d11dc71ac0f9e3a0f16054d9e8a23be7bf6f68319817a9bdde7ae735b55be86728f80b7ec4d5ffe00d403c6536 DIST mysql-connector-odbc-5.2.7-src.tar.gz 606472 SHA256 0ad8fcccb4c41c7100fe02ec0aa87938d33329d23f7b68d1b9031c87750392c9 SHA512 f54ac8a23ade71da85e1335e95eccdccfd68a8687d17a584ced103812bdc5aee8014769a84eaa22724bb2cb23d34c7188c964d3283723defeaef5157a4b3c60f WHIRLPOOL 928808ac5b623ec345c8c1b8495ca1de7f10e65f0d14720e9bee6ab154ccf818ca690745a57fa7fa1c008ba57b24705657398cd9146fbf2e385c178deca0e499 -EBUILD myodbc-5.2.7-r1.ebuild 3396 SHA256 5ea6a923d5c99957b1793d87bd57794656ed6f06e6101ed47a9c8a01298c5a08 SHA512 35f1c45be864ab59040f8478a03bc16938f5faf7d489f1ace518378b2c5b772472013cd5883ad4d7a5b2dbf7be93788cb178d8b8056dbebdb800677036c13105 WHIRLPOOL 7b0a2bb6d68ace7c776778e022f1a697a78a7c8bdab62c7d3b50911286ff8a94d6347d9b7486074e0b150171ea8e778cacd665ca14d6de434e9aac9db900f9d0 -MISC ChangeLog 6162 SHA256 d10e1200a9ba81821c4bd4ee937d97e658f8fbb5a6358ae3f66958133efa354c SHA512 083eaba41d46b2ef9817dc5a3d810128564e12ef373c44f6007eeed1245379847b382375af2b39dac8e16b222cb718c7a3a9838a1f512fce758914086d1f1228 WHIRLPOOL bd995078e99eed21d23965b288fb7f77685a54981f76a7f48a0cc8b92886f7f8540a8b964365d61083d0df481234d47741e324d9d10c436115833c44c6bbc71f -MISC metadata.xml 158 SHA256 a212959a64142f5508788a3d336b55cdb97645b6e54d8a887e7308c67791d569 SHA512 538b01075e7bf3f429546654620fa773f3926594d7747d778ce6250263a7ba32fd7e63e14232fd89d503780b783fb7ab401ff2a0040a8d36c99c5c232609ca56 WHIRLPOOL 1739fa77f8bf21977b25d7c05d8da902f0a30335da5fcaca2b35200e504199c645d4115b8d2b4790ccdb692d7010c7a2cc09b27994679af8be6164f1c007e964 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0 - -iQJ8BAEBCABmBQJVWQcZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE -MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2SLkQAIp2p0TPguTnjmbEYVxQKwnG -oyNMcZ0/zsnoDWV8o4j0aHOqH2zQQbiBcua+t2+tejCjoFyQqyPeOGjzxILctoif -LCKKryRG26XQylTsdQTEJnEdrG3VGBDKcBmIWFcPkyIJzWWl5A5+B38BjjdXelUb -lL8Pr/JgZYAWqh19cwtcr+Cne+KxtrH9qW8VXAo7vqSM/7Q4gQWxsBprokYTsRFK -B6gaEKnSjsK+PxQU7N9jqEBfKsFRsG54sW0wYrqSWEF8Ymt99HlVcGYtjpqPhuMb -4aiKqUN0eWkqzphQJZfQ8D+5w1zZTvKWbwKeTaM/wmciHcHNxQVWd9Zj9fQHEcsF -UDIA3lrCXvZd5Yy/q5kH53krZeJyp0kXiLij+NKXZqIE9+K9m3lrpknYiysnDIp1 -0Tm3RRTQXapQVexIy0LxxDK0XiaiEVRudiSWUiQDfXjqzuMMabzbgeajG9Bk7+uz -rJxsSp66ki4QP2slsem0hsZq0sNNb/nNVwJ4deFEcfybKHbrlvVM3zgF8zfd5gfJ -AzYtX83BMDBdQell6ORa93epR6JbKiCdiqRm2YN7Q/lA/Lavrzc5yovTuq9Mfo44 -9FD1uHPdrRzX+M82j9nJArcF+x8NXk2uONfysfLh5p6lTjFQKLojjxeZhDoEV5t3 -yw4sAlINMTZ4VYt7BadP -=UYl/ ------END PGP SIGNATURE----- +DIST mysql-connector-odbc-5.3.4-src.tar.gz 667340 SHA256 a5f7a490f2958f2768d18b8a57f71909f9699a8619c82776b3ad1c02b8abce0d SHA512 1e3a0c06091f6ca34e89f9fc915f34e94b840db8626a93f56d464aff8d1f8a275c4ef494046ac760e8bcf910a05b91e39a8a1842711e4a78adddcc412ff77ec8 WHIRLPOOL 37bbaac3098377c82889cc30a3bd8b088b751e81a0116b87945a0efccd60f5c3a689176ccbaf866f7957404bbb08d08f9a7885ad68448f7a65188da3b33eb9f2 diff --git a/dev-db/myodbc/files/5.3.4-cxxlinkage.patch b/dev-db/myodbc/files/5.3.4-cxxlinkage.patch new file mode 100644 index 0000000..c770c9b --- /dev/null +++ b/dev-db/myodbc/files/5.3.4-cxxlinkage.patch @@ -0,0 +1,40 @@ +diff -uarN a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake +--- a/cmake/FindMySQL.cmake 2014-06-18 18:50:16.000000000 -0400 ++++ b/cmake/FindMySQL.cmake 2015-07-17 12:25:30.706091000 -0400 +@@ -105,16 +105,16 @@ + # Finally remove the dot + STRING(REGEX REPLACE "[.]" "" MYSQL_NUM_VERSION "${MYSQL_NUM_VERSION}") + +- IF(MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603) ++ IF(MYSQL_CXX_LINKAGE) + EXECUTE_PROCESS(COMMAND ${MYSQL_CONFIG_EXECUTABLE} "--cxxflags" + OUTPUT_VARIABLE _mysql_config_output + ) + SET(MYSQL_CXX_LINKAGE 1) +- ELSE (MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603) ++ ELSE (MYSQL_CXX_LINKAGE) + EXECUTE_PROCESS(COMMAND ${MYSQL_CONFIG_EXECUTABLE} "--cflags" + OUTPUT_VARIABLE _mysql_config_output + ) +- ENDIF(MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603) ++ ENDIF(MYSQL_CXX_LINKAGE) + + # Remove the stl4port dependency + STRING(REGEX REPLACE "-library=stlport4" "" _mysql_config_output "${_mysql_config_output}") +diff -uarN a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2015-07-17 12:20:19.106091000 -0400 ++++ b/CMakeLists.txt 2015-07-17 12:26:36.909091000 -0400 +@@ -256,10 +256,9 @@ + SET(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin") + SET(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib") + +-SET(LIB_SUBDIR "lib") +-IF(RPM_BUILD AND CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64|ppc64|ppc64p7|s390x|sparc64)") +- SET(LIB_SUBDIR "lib64") +-ENDIF() ++IF(NOT LIB_SUBDIR) ++ MESSAGE(ERROR "LIB_SUBDIR is not set") ++ENDIF(NOT LIB_SUBDIR) + + MESSAGE(STATUS "Installation library subdir: ${LIB_SUBDIR}") + diff --git a/dev-db/myodbc/myodbc-5.3.4.ebuild b/dev-db/myodbc/myodbc-5.3.4.ebuild new file mode 100644 index 0000000..5a54057 --- /dev/null +++ b/dev-db/myodbc/myodbc-5.3.4.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/myodbc-5.2.7-r1.ebuild,v 1.4 2015/04/19 07:02:28 pacho Exp $ + +EAPI=5 +inherit cmake-multilib eutils flag-o-matic versionator + +MAJOR="$(get_version_component_range 1-2 $PV)" +MY_PN="mysql-connector-odbc" +MY_P="${MY_PN}-${PV/_p/r}-src" + +DESCRIPTION="ODBC driver for MySQL" +HOMEPAGE="http://www.mysql.com/products/myodbc/" +SRC_URI="mirror://mysql/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz" +RESTRICT="primaryuri" + +LICENSE="GPL-2" +SLOT="${MAJOR}" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="gtk" + +# Does not build with mysql-connector-c +RDEPEND=" + dev-db/unixODBC[${MULTILIB_USEDEP}] + ~virtual/libmysqlclient-18[${MULTILIB_USEDEP}] + gtk? ( x11-libs/gtk+:2= ) + !dev-db/mysql-connector-c +" +DEPEND="${RDEPEND}" +S=${WORKDIR}/${MY_P} + +# Careful! +DRIVER_NAME="${PN}-${SLOT}" + +src_prepare() { + # 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" + + # Patch document path so it doesn't install files to /usr + epatch "${FILESDIR}/cmake-doc-path.patch" \ + "${FILESDIR}/${PV}-cxxlinkage.patch" \ + "${FILESDIR}/5.2.7-mariadb-dynamic-array.patch" +} + +multilib_src_configure() { + # The RPM_BUILD flag does nothing except install to /usr/lib64 when "x86_64" + # MYSQL_CXX_LINKAGE expects "mysql_config --cxxflags" which doesn't exist on MariaDB + +# append-ldflags + mycmakeargs+=( + -DMYSQL_CXX_LINKAGE=0 + -DWITH_UNIXODBC=1 + -DMYSQLCLIENT_LIB_NAME="libmysqlclient.so" + -DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF} + -DMYSQL_LIB_DIR="${ROOT}/usr/$(get_libdir)" + -DLIB_SUBDIR="$(get_libdir)" + -DMYSQL_CONFIG_EXECUTABLE="/usr/bin/${CHOST}-mysql_config" + -DDISABLE_GUI=$(usex gtk 0 1) + ) + cmake-utils_src_configure +} + +multilib_src_install_all() { + debug-print-function ${FUNCNAME} "$@" + + dodir /usr/share/${PN}-${SLOT} + for i in odbc.ini odbcinst.ini; do + einfo "Building $i" + sed \ + -e "s,__PN__,${DRIVER_NAME},g" \ + -e "s,__PF__,${MAJOR},g" \ + -e "s,libmyodbc3.so,libmyodbc${SLOT:0:1}a.so,g" \ + >"${D}"/usr/share/${PN}-${SLOT}/${i} \ + <"${FILESDIR}"/${i}.m4 \ + || die "Failed to build $i" + done; + mv "${D}/usr/bin/myodbc-installer" \ + "${D}/usr/bin/myodbc-installer-${MAJOR}" || die "failed to move slotted binary" +} + +pkg_config() { + + [ "${ROOT}" != "/" ] && \ + die 'Sorry, non-standard ROOT setting is not supported :-(' + + local msg='MySQL ODBC driver' + local drivers=$(/usr/bin/odbcinst -q -d) + + if echo $drivers | grep -vq "^\[${DRIVER_NAME}\]$" ; then + ebegin "Installing ${msg}" + /usr/bin/odbcinst -i -d -f /usr/share/${PN}-${SLOT}/odbcinst.ini + rc=$? + eend $rc + [ $rc -ne 0 ] && die + else + einfo "Skipping already installed ${msg}" + fi + + local sources=$(/usr/bin/odbcinst -q -s) + msg='sample MySQL ODBC DSN' + if echo $sources | grep -vq "^\[${DRIVER_NAME}-test\]$"; then + ebegin "Installing ${msg}" + /usr/bin/odbcinst -i -s -l -f /usr/share/${PN}-${SLOT}/odbc.ini + rc=$? + eend $rc + [ $rc -ne 0 ] && die + else + einfo "Skipping already installed ${msg}" + fi +} + +pkg_postinst() { + + elog "If this is a new install, please run the following command" + elog "to configure the MySQL ODBC drivers and sources:" + elog "emerge --config =${CATEGORY}/${PF}" + elog "Please note that the driver name used to form the DSN now includes the SLOT." + elog "The myodbc-install utility is installed as myodbc-install-${MAJOR}" +}