[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/, dev-db/myodbc/files/
commit: 50d4c3260ae7b8a644779ba36463a7827a2f5edb
Author: Christopher Fore posteo net>
AuthorDate: Thu Dec 14 19:49:52 2023 +
Commit: Sam James gentoo org>
CommitDate: Wed Apr 24 19:07:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50d4c326
dev-db/myodbc: add 8.0.32, fix GCC 14 error, EAPI bump
Patch attached includes ``.
Bump EAPI 7 -> 8.
Closes: https://bugs.gentoo.org/919501
Signed-off-by: Christopher Fore posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/34274
Signed-off-by: Sam James gentoo.org>
dev-db/myodbc/Manifest | 1 +
.../files/myodbc-8.0.32-include-string.patch | 14 +++
dev-db/myodbc/myodbc-8.0.32.ebuild | 128 +
3 files changed, 143 insertions(+)
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index 9aab17339b8a..36c1165fbe55 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -1 +1,2 @@
DIST mysql-connector-odbc-8.0.27-src.tar.gz 3849283 BLAKE2B
6a2500cdd706c0f8cda83dd04d3e573baa0bfbad59c931e20bb25a3f09dd78d2380079d0a20e075c3f44482d58acb6e727f4cbcf490e9d4d7817dd26f98061ee
SHA512
4f907b7647425c274d3bd1c3b3ebbb83ac2360f2ee56733dabb501c17b800a26ef1117e16e5b05180ff904bfc642d25393baa861b96a79edf9d35f186a8689b2
+DIST mysql-connector-odbc-8.0.32-src.tar.gz 3845574 BLAKE2B
84adca951149739b79c60ee89416d2e638c5a5880feaed69afbd9de3a671ce505bad04303ccab9f13410f83e8827d9e3ee658b9e1241e66243d3424ac525525b
SHA512
8011b131657e214de3f33407893ff990e2238e79a5d0ef76a64797c6f160f0895ed819e81c04054b3b4d439fc0db85c4813c713401db28092a9f6da16f24fb34
diff --git a/dev-db/myodbc/files/myodbc-8.0.32-include-string.patch
b/dev-db/myodbc/files/myodbc-8.0.32-include-string.patch
new file mode 100644
index ..6bf31e1a53eb
--- /dev/null
+++ b/dev-db/myodbc/files/myodbc-8.0.32-include-string.patch
@@ -0,0 +1,14 @@
+# Gentoo Bug: https://bugs.gentoo.org/919501
+
+diff --git a/dltest/dltest.c b/dltest/dltest.c
+index d3b9360..3fb354b 100644
+--- a/dltest/dltest.c
b/dltest/dltest.c
+@@ -28,6 +28,7 @@
+
+ #include
+ #include
++#include
+
+ #ifdef WIN32
+ #include
diff --git a/dev-db/myodbc/myodbc-8.0.32.ebuild
b/dev-db/myodbc/myodbc-8.0.32.ebuild
new file mode 100644
index ..4b81f9c17da2
--- /dev/null
+++ b/dev-db/myodbc/myodbc-8.0.32.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+MAJOR="$(ver_cut 1-2)"
+MY_PN="mysql-connector-odbc"
+MY_P="${MY_PN}-${PV/_p/r}-src"
+
+DESCRIPTION="ODBC driver for MySQL"
+HOMEPAGE="https://dev.mysql.com/downloads/connector/odbc/;
+SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="${MAJOR}"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+ dev-db/unixODBC[${MULTILIB_USEDEP}]
+ >=dev-db/mysql-connector-c-8.0:0=[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+S=${WORKDIR}/${MY_P}
+
+# Careful!
+DRIVER_NAME="${PN}-${SLOT}"
+
+# Patch document path so it doesn't install files to /usr
+PATCHES=(
+ "${FILESDIR}/${MAJOR}-cmake-doc-path.patch"
+ "${FILESDIR}/${PN}-8.0.19-cxxlinkage.patch"
+ "${FILESDIR}/${PN}-8.0.32-include-string.patch"
+)
+
+src_prepare() {
+ # Remove Tests
+ sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
+ "${S}/CMakeLists.txt"
+
+ cmake_src_prepare
+}
+
+multilib_src_configure() {
+ CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+ mycmakeargs+=(
+ -DCMAKE_C_FLAGS_RELWITHDEBINFO=-DNDEBUG
+ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-DNDEBUG
+ -DMYSQLCLIENT_STATIC_LINKING=OFF
+ -DMYSQL_CXX_LINKAGE=YES
+ -DWITH_UNIXODBC=YES
+
-DWITH_DOCUMENTATION_INSTALL_PATH="${EPREFIX}"/usr/share/doc/${PF}
+ -DLIB_SUBDIR="$(get_libdir)/${PN}-${MAJOR}"
+ -DMYSQLCLIENT_NO_THREADS=ON
+ -DDISABLE_GUI=ON
+ # Don't build "libmysql_strings.so" and "libmysql_sys.so" which
are only
+ # used internally
+ -DBUILD_SHARED_LIBS=OFF
+ # The NUMA and LIBWRAP options are not really used.
+ # They are just copied from the server code
+ -DWITH_NUMA=OFF
+ -DWITH_LIBWRAP=OFF
+ )
+
+ cmake_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,lib/libmyodbc3.so,$(get_libdir)/${PN}-${MAJOR}/libmyodbc${SLOT:0:1}a.so,g" \
+ >"${D}"/usr/share/${PN}-${SLOT}/${i} \
+ <"${FILESDIR}"/${i}.m4 \
+
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: a043c51e799c86d2a15b4ff636c4e5345eae3bf3
Author: Sam James gentoo org>
AuthorDate: Wed Apr 24 19:07:42 2024 +
Commit: Sam James gentoo org>
CommitDate: Wed Apr 24 19:07:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a043c51e
dev-db/myodbc: don't install test dir
Signed-off-by: Sam James gentoo.org>
dev-db/myodbc/myodbc-8.0.32.ebuild | 12 +++-
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/dev-db/myodbc/myodbc-8.0.32.ebuild
b/dev-db/myodbc/myodbc-8.0.32.ebuild
index 4b81f9c17da2..942a50b491f7 100644
--- a/dev-db/myodbc/myodbc-8.0.32.ebuild
+++ b/dev-db/myodbc/myodbc-8.0.32.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -12,6 +12,7 @@ MY_P="${MY_PN}-${PV/_p/r}-src"
DESCRIPTION="ODBC driver for MySQL"
HOMEPAGE="https://dev.mysql.com/downloads/connector/odbc/;
SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz;
+S="${WORKDIR}"/${MY_P}
LICENSE="GPL-2"
SLOT="${MAJOR}"
@@ -22,22 +23,21 @@ RDEPEND="
>=dev-db/mysql-connector-c-8.0:0=[${MULTILIB_USEDEP}]
"
DEPEND="${RDEPEND}"
-S=${WORKDIR}/${MY_P}
# Careful!
DRIVER_NAME="${PN}-${SLOT}"
-# Patch document path so it doesn't install files to /usr
PATCHES=(
+ # Patch document path so it doesn't install files to /usr
"${FILESDIR}/${MAJOR}-cmake-doc-path.patch"
"${FILESDIR}/${PN}-8.0.19-cxxlinkage.patch"
"${FILESDIR}/${PN}-8.0.32-include-string.patch"
)
src_prepare() {
- # Remove Tests
+ # Remove tests
sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
- "${S}/CMakeLists.txt"
+ "${S}/CMakeLists.txt" || die
cmake_src_prepare
}
@@ -70,6 +70,8 @@ multilib_src_configure() {
multilib_src_install_all() {
debug-print-function ${FUNCNAME} "$@"
+ rm -rf "${ED}"/usr/test || die
+
dodir /usr/share/${PN}-${SLOT}
for i in odbc.ini odbcinst.ini; do
einfo "Building $i"
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: 734ddb6314de84c235c0276b56cb58e8ab66e22a Author: Sam James gentoo org> AuthorDate: Thu Dec 14 00:51:00 2023 + Commit: Sam James gentoo org> CommitDate: Thu Dec 14 02:15:21 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=734ddb63 dev-db/myodbc: add github upstream metadata Signed-off-by: Sam James gentoo.org> dev-db/myodbc/metadata.xml | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dev-db/myodbc/metadata.xml b/dev-db/myodbc/metadata.xml index 8973b55f07b5..7bc9d15851cf 100644 --- a/dev-db/myodbc/metadata.xml +++ b/dev-db/myodbc/metadata.xml @@ -1,8 +1,11 @@ https://www.gentoo.org/dtd/metadata.dtd;> - - mysql-b...@gentoo.org - MySQL - + + mysql-b...@gentoo.org + MySQL + + + mysql/mysql-connector-odbc +
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: c2f0770f1e07112022c3efab29bde481ff0f2597
Author: Sam James gentoo org>
AuthorDate: Sat Apr 23 02:05:56 2022 +
Commit: Sam James gentoo org>
CommitDate: Sat Apr 23 02:05:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2f0770f
dev-db/myodbc: fix ROOT check in pkg_postinst
With EAPI 7+, ROOT and others will be blank (not /).
Signed-off-by: Sam James gentoo.org>
dev-db/myodbc/{myodbc-8.0.27.ebuild => myodbc-8.0.27-r1.ebuild} | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/dev-db/myodbc/myodbc-8.0.27.ebuild
b/dev-db/myodbc/myodbc-8.0.27-r1.ebuild
similarity index 99%
rename from dev-db/myodbc/myodbc-8.0.27.ebuild
rename to dev-db/myodbc/myodbc-8.0.27-r1.ebuild
index 21745e0ba5ee..7689549feac7 100644
--- a/dev-db/myodbc/myodbc-8.0.27.ebuild
+++ b/dev-db/myodbc/myodbc-8.0.27-r1.ebuild
@@ -92,8 +92,7 @@ multilib_src_install_all() {
}
pkg_config() {
-
- [ "${ROOT}" != "/" ] && \
+ [ -n "${ROOT}" ] && \
die 'Sorry, non-standard ROOT setting is not supported :-('
local msg='MySQL ODBC driver'
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: bf2da4b71b8e58b55d6b3936c9ee8943532f
Author: David Seifert gentoo org>
AuthorDate: Thu Mar 3 21:21:47 2022 +
Commit: David Seifert gentoo org>
CommitDate: Thu Mar 3 21:21:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf2da4b7
dev-db/myodbc: drop 8.0.22, 8.0.23, 8.0.25, 8.0.26
Bug: https://bugs.gentoo.org/822258
Signed-off-by: David Seifert gentoo.org>
dev-db/myodbc/Manifest | 4 --
dev-db/myodbc/myodbc-8.0.22.ebuild | 118 -
dev-db/myodbc/myodbc-8.0.23.ebuild | 122 --
dev-db/myodbc/myodbc-8.0.25.ebuild | 129
dev-db/myodbc/myodbc-8.0.26.ebuild | 131 -
5 files changed, 504 deletions(-)
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index 56321487fce9..9aab17339b8a 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -1,5 +1 @@
-DIST mysql-connector-odbc-8.0.22-src.tar.gz 3726015 BLAKE2B
055920446767b0c9a30a0ca4773e71d662b398a9849df1a0b7975d71a21cfb23f540d8dda5430c717569f173e63673d3e51b025bb098e51202093d33e19bc142
SHA512
c613ae60346cea2e57bade89d813fd5ac21d0712d3d751e3acbc275421da6ac7593afc3da9fb6d161ee413f60e76e670f0c84876591f331925c980d969db4e8c
-DIST mysql-connector-odbc-8.0.23-src.tar.gz 3726277 BLAKE2B
21b5e6f3f7e77d6107268800441675a230c79071e52db39093fade6e02031c12c96371d165af9459e9739e069e5b4196f0169dff54c0fa300e7a3023e8a82722
SHA512
2f66b5e1796176d638b1209b7d3381c2600a11cc88fa0dfb1f29b16a6c59386926674d5581d4843036d061af09312d58620484730bd7cdad36c0a0dcd45d49a9
-DIST mysql-connector-odbc-8.0.25-src.tar.gz 3736461 BLAKE2B
888219340ed2ea86194b2aeab04719c58f2bdfaedb4364492eab2d8cce4b7617a259ae075fada3f55f2bd475d310b5a98642a791ac1efff22a8ceda31bbdf89c
SHA512
b2df4134d89600708f30866ded6d915246d36eea087a5c86c0030ba55a1a96c7ee37f023183a28e2f731851969ee802846012e4435fb86a38f7a0f09571d32ac
-DIST mysql-connector-odbc-8.0.26-src.tar.gz 3760542 BLAKE2B
e0da539743335bc70a7b809759121d5186782df27c301dc9bb34a73d5584540906df72f0e2b2bfa8af47587693063286cd3eadd3b69f77398264463e69a20e35
SHA512
caed3db20fb42df5123356a973e4f8cc1b162be0ada1de881981237e9a7b39d95f3f0aa48fceeff23139c3d05fc24115bf900206db7a497f4ed734a2234eb528
DIST mysql-connector-odbc-8.0.27-src.tar.gz 3849283 BLAKE2B
6a2500cdd706c0f8cda83dd04d3e573baa0bfbad59c931e20bb25a3f09dd78d2380079d0a20e075c3f44482d58acb6e727f4cbcf490e9d4d7817dd26f98061ee
SHA512
4f907b7647425c274d3bd1c3b3ebbb83ac2360f2ee56733dabb501c17b800a26ef1117e16e5b05180ff904bfc642d25393baa861b96a79edf9d35f186a8689b2
diff --git a/dev-db/myodbc/myodbc-8.0.22.ebuild
b/dev-db/myodbc/myodbc-8.0.22.ebuild
deleted file mode 100644
index 93159f140c95..
--- a/dev-db/myodbc/myodbc-8.0.22.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-MAJOR="$(ver_cut 1-2)"
-MY_PN="mysql-connector-odbc"
-MY_P="${MY_PN}-${PV/_p/r}-src"
-
-DESCRIPTION="ODBC driver for MySQL"
-HOMEPAGE="https://dev.mysql.com/downloads/connector/odbc/;
-SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="${MAJOR}"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-# Broken when built dynamically against libmysqlclient.so
-RDEPEND="
- dev-db/unixODBC[${MULTILIB_USEDEP}]
- >=dev-db/mysql-connector-c-8.0:0=[static-libs,${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-S=${WORKDIR}/${MY_P}
-
-# Careful!
-DRIVER_NAME="${PN}-${SLOT}"
-
-# Patch document path so it doesn't install files to /usr
-PATCHES=(
- "${FILESDIR}/${MAJOR}-cmake-doc-path.patch"
- "${FILESDIR}/${PN}-8.0.19-cxxlinkage.patch"
-)
-
-src_prepare() {
- # Remove Tests
- sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
- "${S}/CMakeLists.txt"
-
- cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
- mycmakeargs+=(
- -DMYSQLCLIENT_STATIC_LINKING=1
- -DMYSQL_CXX_LINKAGE=1
- -DWITH_UNIXODBC=1
- -DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF}
- -DLIB_SUBDIR="$(get_libdir)/${PN}-${MAJOR}"
- -DMYSQLCLIENT_NO_THREADS=ON
- -DDISABLE_GUI=ON
- # The NUMA and LIBWRAP options are not really used.
- # They are just copied from the server code
- -DWITH_NUMA=OFF
- -DWITH_LIBWRAP=OFF
- )
- 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
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: f28387e20e1c371c434fdad502c9618a91c8f1ea
Author: Sam James gentoo org>
AuthorDate: Thu Jan 13 04:18:16 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu Jan 13 04:18:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f28387e2
dev-db/myodbc: Stabilize 8.0.27 x86, #822258
Signed-off-by: Sam James gentoo.org>
dev-db/myodbc/myodbc-8.0.27.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-db/myodbc/myodbc-8.0.27.ebuild
b/dev-db/myodbc/myodbc-8.0.27.ebuild
index 5e3222dedb05..21745e0ba5ee 100644
--- a/dev-db/myodbc/myodbc-8.0.27.ebuild
+++ b/dev-db/myodbc/myodbc-8.0.27.ebuild
@@ -17,7 +17,7 @@
SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar
LICENSE="GPL-2"
SLOT="${MAJOR}"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE=""
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: e55d8a7bf6d8ec99a3a0b7b8f0cdfc734b7fc6d2
Author: Sam James gentoo org>
AuthorDate: Thu Jan 13 04:18:08 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu Jan 13 04:18:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e55d8a7b
dev-db/myodbc: Stabilize 8.0.27 amd64, #822258
Signed-off-by: Sam James gentoo.org>
dev-db/myodbc/myodbc-8.0.27.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-db/myodbc/myodbc-8.0.27.ebuild
b/dev-db/myodbc/myodbc-8.0.27.ebuild
index 49e7ed8c3c63..5e3222dedb05 100644
--- a/dev-db/myodbc/myodbc-8.0.27.ebuild
+++ b/dev-db/myodbc/myodbc-8.0.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,7 +17,7 @@
SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar
LICENSE="GPL-2"
SLOT="${MAJOR}"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE=""
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: bf352d7d38df2ede0095f4b6e73ab7253865cdaa
Author: Thomas Deutschmann gentoo org>
AuthorDate: Sun Nov 14 03:48:41 2021 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sun Nov 14 03:49:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf352d7d
dev-db/myodbc: bump to v8.0.27
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann gentoo.org>
dev-db/myodbc/Manifest | 1 +
dev-db/myodbc/myodbc-8.0.27.ebuild | 131 +
2 files changed, 132 insertions(+)
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index ff45a554d0ce..56321487fce9 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -2,3 +2,4 @@ DIST mysql-connector-odbc-8.0.22-src.tar.gz 3726015 BLAKE2B
055920446767b0c9a30a
DIST mysql-connector-odbc-8.0.23-src.tar.gz 3726277 BLAKE2B
21b5e6f3f7e77d6107268800441675a230c79071e52db39093fade6e02031c12c96371d165af9459e9739e069e5b4196f0169dff54c0fa300e7a3023e8a82722
SHA512
2f66b5e1796176d638b1209b7d3381c2600a11cc88fa0dfb1f29b16a6c59386926674d5581d4843036d061af09312d58620484730bd7cdad36c0a0dcd45d49a9
DIST mysql-connector-odbc-8.0.25-src.tar.gz 3736461 BLAKE2B
888219340ed2ea86194b2aeab04719c58f2bdfaedb4364492eab2d8cce4b7617a259ae075fada3f55f2bd475d310b5a98642a791ac1efff22a8ceda31bbdf89c
SHA512
b2df4134d89600708f30866ded6d915246d36eea087a5c86c0030ba55a1a96c7ee37f023183a28e2f731851969ee802846012e4435fb86a38f7a0f09571d32ac
DIST mysql-connector-odbc-8.0.26-src.tar.gz 3760542 BLAKE2B
e0da539743335bc70a7b809759121d5186782df27c301dc9bb34a73d5584540906df72f0e2b2bfa8af47587693063286cd3eadd3b69f77398264463e69a20e35
SHA512
caed3db20fb42df5123356a973e4f8cc1b162be0ada1de881981237e9a7b39d95f3f0aa48fceeff23139c3d05fc24115bf900206db7a497f4ed734a2234eb528
+DIST mysql-connector-odbc-8.0.27-src.tar.gz 3849283 BLAKE2B
6a2500cdd706c0f8cda83dd04d3e573baa0bfbad59c931e20bb25a3f09dd78d2380079d0a20e075c3f44482d58acb6e727f4cbcf490e9d4d7817dd26f98061ee
SHA512
4f907b7647425c274d3bd1c3b3ebbb83ac2360f2ee56733dabb501c17b800a26ef1117e16e5b05180ff904bfc642d25393baa861b96a79edf9d35f186a8689b2
diff --git a/dev-db/myodbc/myodbc-8.0.27.ebuild
b/dev-db/myodbc/myodbc-8.0.27.ebuild
new file mode 100644
index ..49e7ed8c3c63
--- /dev/null
+++ b/dev-db/myodbc/myodbc-8.0.27.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib
+
+MAJOR="$(ver_cut 1-2)"
+MY_PN="mysql-connector-odbc"
+MY_P="${MY_PN}-${PV/_p/r}-src"
+
+DESCRIPTION="ODBC driver for MySQL"
+HOMEPAGE="https://dev.mysql.com/downloads/connector/odbc/;
+SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="${MAJOR}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-db/unixODBC[${MULTILIB_USEDEP}]
+ >=dev-db/mysql-connector-c-8.0:0=[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+S=${WORKDIR}/${MY_P}
+
+# Careful!
+DRIVER_NAME="${PN}-${SLOT}"
+
+# Patch document path so it doesn't install files to /usr
+PATCHES=(
+ "${FILESDIR}/${MAJOR}-cmake-doc-path.patch"
+ "${FILESDIR}/${PN}-8.0.19-cxxlinkage.patch"
+)
+
+src_prepare() {
+ # Remove Tests
+ sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
+ "${S}/CMakeLists.txt"
+
+ cmake_src_prepare
+}
+
+multilib_src_configure() {
+ CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+ mycmakeargs+=(
+ -DCMAKE_C_FLAGS_RELWITHDEBINFO=-DNDEBUG
+ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-DNDEBUG
+ -DMYSQLCLIENT_STATIC_LINKING=OFF
+ -DMYSQL_CXX_LINKAGE=YES
+ -DWITH_UNIXODBC=YES
+ -DWITH_DOCUMENTATION_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}
+ -DLIB_SUBDIR="$(get_libdir)/${PN}-${MAJOR}"
+ -DMYSQLCLIENT_NO_THREADS=ON
+ -DDISABLE_GUI=ON
+ # Don't build "libmysql_strings.so" and "libmysql_sys.so" which
are only
+ # used internally
+ -DBUILD_SHARED_LIBS=OFF
+ # The NUMA and LIBWRAP options are not really used.
+ # They are just copied from the server code
+ -DWITH_NUMA=OFF
+ -DWITH_LIBWRAP=OFF
+ )
+
+ cmake_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,lib/libmyodbc3.so,$(get_libdir)/${PN}-${MAJOR}/libmyodbc${SLOT:0:1}a.so,g" \
+ >"${D}"/usr/share/${PN}-${SLOT}/${i} \
+ <"${FILESDIR}"/${i}.m4 \
+ || die "Failed to build
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: 0cdce12b73f07193124fc129274f7a70d3038501
Author: Sam James gentoo org>
AuthorDate: Sat Oct 16 03:47:52 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Oct 16 03:47:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cdce12b
dev-db/myodbc: Stabilize 8.0.25 ppc, #789252
Signed-off-by: Sam James gentoo.org>
dev-db/myodbc/myodbc-8.0.25.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-db/myodbc/myodbc-8.0.25.ebuild
b/dev-db/myodbc/myodbc-8.0.25.ebuild
index 47d507edc55..0d31b30ad0b 100644
--- a/dev-db/myodbc/myodbc-8.0.25.ebuild
+++ b/dev-db/myodbc/myodbc-8.0.25.ebuild
@@ -15,7 +15,7 @@
SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar
LICENSE="GPL-2"
SLOT="${MAJOR}"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
IUSE=""
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: 099eb9564e2e0aa5c88f4f508eef953123c48310
Author: Thomas Deutschmann gentoo org>
AuthorDate: Wed Aug 4 19:09:39 2021 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Wed Aug 4 19:13:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=099eb956
dev-db/myodbc: bump to v8.0.26
Closes: https://bugs.gentoo.org/770523
Package-Manager: Portage-3.0.21, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann gentoo.org>
dev-db/myodbc/Manifest | 1 +
dev-db/myodbc/myodbc-8.0.26.ebuild | 131 +
2 files changed, 132 insertions(+)
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index 22fd2003e2c..ff45a554d0c 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -1,3 +1,4 @@
DIST mysql-connector-odbc-8.0.22-src.tar.gz 3726015 BLAKE2B
055920446767b0c9a30a0ca4773e71d662b398a9849df1a0b7975d71a21cfb23f540d8dda5430c717569f173e63673d3e51b025bb098e51202093d33e19bc142
SHA512
c613ae60346cea2e57bade89d813fd5ac21d0712d3d751e3acbc275421da6ac7593afc3da9fb6d161ee413f60e76e670f0c84876591f331925c980d969db4e8c
DIST mysql-connector-odbc-8.0.23-src.tar.gz 3726277 BLAKE2B
21b5e6f3f7e77d6107268800441675a230c79071e52db39093fade6e02031c12c96371d165af9459e9739e069e5b4196f0169dff54c0fa300e7a3023e8a82722
SHA512
2f66b5e1796176d638b1209b7d3381c2600a11cc88fa0dfb1f29b16a6c59386926674d5581d4843036d061af09312d58620484730bd7cdad36c0a0dcd45d49a9
DIST mysql-connector-odbc-8.0.25-src.tar.gz 3736461 BLAKE2B
888219340ed2ea86194b2aeab04719c58f2bdfaedb4364492eab2d8cce4b7617a259ae075fada3f55f2bd475d310b5a98642a791ac1efff22a8ceda31bbdf89c
SHA512
b2df4134d89600708f30866ded6d915246d36eea087a5c86c0030ba55a1a96c7ee37f023183a28e2f731851969ee802846012e4435fb86a38f7a0f09571d32ac
+DIST mysql-connector-odbc-8.0.26-src.tar.gz 3760542 BLAKE2B
e0da539743335bc70a7b809759121d5186782df27c301dc9bb34a73d5584540906df72f0e2b2bfa8af47587693063286cd3eadd3b69f77398264463e69a20e35
SHA512
caed3db20fb42df5123356a973e4f8cc1b162be0ada1de881981237e9a7b39d95f3f0aa48fceeff23139c3d05fc24115bf900206db7a497f4ed734a2234eb528
diff --git a/dev-db/myodbc/myodbc-8.0.26.ebuild
b/dev-db/myodbc/myodbc-8.0.26.ebuild
new file mode 100644
index 000..49e7ed8c3c6
--- /dev/null
+++ b/dev-db/myodbc/myodbc-8.0.26.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib
+
+MAJOR="$(ver_cut 1-2)"
+MY_PN="mysql-connector-odbc"
+MY_P="${MY_PN}-${PV/_p/r}-src"
+
+DESCRIPTION="ODBC driver for MySQL"
+HOMEPAGE="https://dev.mysql.com/downloads/connector/odbc/;
+SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="${MAJOR}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-db/unixODBC[${MULTILIB_USEDEP}]
+ >=dev-db/mysql-connector-c-8.0:0=[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+S=${WORKDIR}/${MY_P}
+
+# Careful!
+DRIVER_NAME="${PN}-${SLOT}"
+
+# Patch document path so it doesn't install files to /usr
+PATCHES=(
+ "${FILESDIR}/${MAJOR}-cmake-doc-path.patch"
+ "${FILESDIR}/${PN}-8.0.19-cxxlinkage.patch"
+)
+
+src_prepare() {
+ # Remove Tests
+ sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
+ "${S}/CMakeLists.txt"
+
+ cmake_src_prepare
+}
+
+multilib_src_configure() {
+ CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+ mycmakeargs+=(
+ -DCMAKE_C_FLAGS_RELWITHDEBINFO=-DNDEBUG
+ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-DNDEBUG
+ -DMYSQLCLIENT_STATIC_LINKING=OFF
+ -DMYSQL_CXX_LINKAGE=YES
+ -DWITH_UNIXODBC=YES
+ -DWITH_DOCUMENTATION_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}
+ -DLIB_SUBDIR="$(get_libdir)/${PN}-${MAJOR}"
+ -DMYSQLCLIENT_NO_THREADS=ON
+ -DDISABLE_GUI=ON
+ # Don't build "libmysql_strings.so" and "libmysql_sys.so" which
are only
+ # used internally
+ -DBUILD_SHARED_LIBS=OFF
+ # The NUMA and LIBWRAP options are not really used.
+ # They are just copied from the server code
+ -DWITH_NUMA=OFF
+ -DWITH_LIBWRAP=OFF
+ )
+
+ cmake_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,lib/libmyodbc3.so,$(get_libdir)/${PN}-${MAJOR}/libmyodbc${SLOT:0:1}a.so,g" \
+ >"${D}"/usr/share/${PN}-${SLOT}/${i} \
+ <"${FILESDIR}"/${i}.m4 \
+ || die "Failed to build $i"
+ done
+
+ rm -rf
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: 6d56b30f4a525a38309c939bd192caa38aab5c4c
Author: Thomas Deutschmann gentoo org>
AuthorDate: Wed May 12 14:36:33 2021 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Wed May 12 15:37:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d56b30f
dev-db/myodbc: bump to v8.0.25
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann gentoo.org>
dev-db/myodbc/Manifest | 2 +-
dev-db/myodbc/{myodbc-8.0.24-r1.ebuild => myodbc-8.0.25.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index b94a0b1dc2e..22fd2003e2c 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -1,3 +1,3 @@
DIST mysql-connector-odbc-8.0.22-src.tar.gz 3726015 BLAKE2B
055920446767b0c9a30a0ca4773e71d662b398a9849df1a0b7975d71a21cfb23f540d8dda5430c717569f173e63673d3e51b025bb098e51202093d33e19bc142
SHA512
c613ae60346cea2e57bade89d813fd5ac21d0712d3d751e3acbc275421da6ac7593afc3da9fb6d161ee413f60e76e670f0c84876591f331925c980d969db4e8c
DIST mysql-connector-odbc-8.0.23-src.tar.gz 3726277 BLAKE2B
21b5e6f3f7e77d6107268800441675a230c79071e52db39093fade6e02031c12c96371d165af9459e9739e069e5b4196f0169dff54c0fa300e7a3023e8a82722
SHA512
2f66b5e1796176d638b1209b7d3381c2600a11cc88fa0dfb1f29b16a6c59386926674d5581d4843036d061af09312d58620484730bd7cdad36c0a0dcd45d49a9
-DIST mysql-connector-odbc-8.0.24-src.tar.gz 3736373 BLAKE2B
8d03566471343239dd49f09bc02a0852f73544e0a91532e75d7871fa2842880213df0241691ab5449597bfed9dae3a74d87d2ed43092aad6bd66bee511542863
SHA512
1e182fd017092a47e38c96006a55d2d21496b2e5b67c211f9ea5b3c3cae44035bc9d401fc90c4f4e8ef6a347dbbbf78870b5dbc3711613fc28cddea468efa6f3
+DIST mysql-connector-odbc-8.0.25-src.tar.gz 3736461 BLAKE2B
888219340ed2ea86194b2aeab04719c58f2bdfaedb4364492eab2d8cce4b7617a259ae075fada3f55f2bd475d310b5a98642a791ac1efff22a8ceda31bbdf89c
SHA512
b2df4134d89600708f30866ded6d915246d36eea087a5c86c0030ba55a1a96c7ee37f023183a28e2f731851969ee802846012e4435fb86a38f7a0f09571d32ac
diff --git a/dev-db/myodbc/myodbc-8.0.24-r1.ebuild
b/dev-db/myodbc/myodbc-8.0.25.ebuild
similarity index 100%
rename from dev-db/myodbc/myodbc-8.0.24-r1.ebuild
rename to dev-db/myodbc/myodbc-8.0.25.ebuild
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: a22347d4c71b105dc09eafec3020bc11d7bf905f
Author: Agostino Sarubbo gentoo org>
AuthorDate: Tue May 11 10:03:20 2021 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Tue May 11 10:03:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a22347d4
dev-db/myodbc: x86 stable wrt bug #789252
Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
dev-db/myodbc/myodbc-8.0.24-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-db/myodbc/myodbc-8.0.24-r1.ebuild
b/dev-db/myodbc/myodbc-8.0.24-r1.ebuild
index ce688e16d2e..47d507edc55 100644
--- a/dev-db/myodbc/myodbc-8.0.24-r1.ebuild
+++ b/dev-db/myodbc/myodbc-8.0.24-r1.ebuild
@@ -15,7 +15,7 @@
SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar
LICENSE="GPL-2"
SLOT="${MAJOR}"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE=""
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: cb4ccce2c1385c617e49a5d2dad7c0eb344fe7c3
Author: Agostino Sarubbo gentoo org>
AuthorDate: Tue May 11 10:01:32 2021 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Tue May 11 10:01:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb4ccce2
dev-db/myodbc: amd64 stable wrt bug #789252
Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
dev-db/myodbc/myodbc-8.0.24-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-db/myodbc/myodbc-8.0.24-r1.ebuild
b/dev-db/myodbc/myodbc-8.0.24-r1.ebuild
index 888d9f95fe1..ce688e16d2e 100644
--- a/dev-db/myodbc/myodbc-8.0.24-r1.ebuild
+++ b/dev-db/myodbc/myodbc-8.0.24-r1.ebuild
@@ -15,7 +15,7 @@
SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar
LICENSE="GPL-2"
SLOT="${MAJOR}"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE=""
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: 6d5db58628c43216250f1d67de7d9c91aef13847
Author: Thomas Deutschmann gentoo org>
AuthorDate: Mon Apr 26 14:52:27 2021 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Mon Apr 26 14:55:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d5db586
dev-db/myodbc: don't static link mysqlclient anymore
Closes: https://bugs.gentoo.org/769299
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann gentoo.org>
.../{myodbc-8.0.24.ebuild => myodbc-8.0.24-r1.ebuild} | 17 -
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/dev-db/myodbc/myodbc-8.0.24.ebuild
b/dev-db/myodbc/myodbc-8.0.24-r1.ebuild
similarity index 88%
rename from dev-db/myodbc/myodbc-8.0.24.ebuild
rename to dev-db/myodbc/myodbc-8.0.24-r1.ebuild
index aca18615d23..888d9f95fe1 100644
--- a/dev-db/myodbc/myodbc-8.0.24.ebuild
+++ b/dev-db/myodbc/myodbc-8.0.24-r1.ebuild
@@ -18,10 +18,9 @@ SLOT="${MAJOR}"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE=""
-# Broken when built dynamically against libmysqlclient.so
RDEPEND="
dev-db/unixODBC[${MULTILIB_USEDEP}]
- >=dev-db/mysql-connector-c-8.0:0=[static-libs,${MULTILIB_USEDEP}]
+ >=dev-db/mysql-connector-c-8.0:0=[${MULTILIB_USEDEP}]
"
DEPEND="${RDEPEND}"
S=${WORKDIR}/${MY_P}
@@ -44,19 +43,27 @@ src_prepare() {
}
multilib_src_configure() {
+ CMAKE_BUILD_TYPE="RelWithDebInfo"
+
mycmakeargs+=(
- -DMYSQLCLIENT_STATIC_LINKING=1
- -DMYSQL_CXX_LINKAGE=1
- -DWITH_UNIXODBC=1
+ -DCMAKE_C_FLAGS_RELWITHDEBINFO=-DNDEBUG
+ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-DNDEBUG
+ -DMYSQLCLIENT_STATIC_LINKING=OFF
+ -DMYSQL_CXX_LINKAGE=YES
+ -DWITH_UNIXODBC=YES
-DWITH_DOCUMENTATION_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}
-DLIB_SUBDIR="$(get_libdir)/${PN}-${MAJOR}"
-DMYSQLCLIENT_NO_THREADS=ON
-DDISABLE_GUI=ON
+ # Don't build "libmysql_strings.so" and "libmysql_sys.so" which
are only
+ # used internally
+ -DBUILD_SHARED_LIBS=OFF
# The NUMA and LIBWRAP options are not really used.
# They are just copied from the server code
-DWITH_NUMA=OFF
-DWITH_LIBWRAP=OFF
)
+
cmake-utils_src_configure
}
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: 6891a1c0d1f670fa6e62455919f7cae25f172995
Author: Thomas Deutschmann gentoo org>
AuthorDate: Mon Apr 26 01:01:03 2021 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Mon Apr 26 01:01:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6891a1c0
dev-db/myodbc: bump to v8.0.24
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann gentoo.org>
dev-db/myodbc/Manifest | 1 +
dev-db/myodbc/myodbc-8.0.24.ebuild | 122 +
2 files changed, 123 insertions(+)
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index a46cf8c41c1..b94a0b1dc2e 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -1,2 +1,3 @@
DIST mysql-connector-odbc-8.0.22-src.tar.gz 3726015 BLAKE2B
055920446767b0c9a30a0ca4773e71d662b398a9849df1a0b7975d71a21cfb23f540d8dda5430c717569f173e63673d3e51b025bb098e51202093d33e19bc142
SHA512
c613ae60346cea2e57bade89d813fd5ac21d0712d3d751e3acbc275421da6ac7593afc3da9fb6d161ee413f60e76e670f0c84876591f331925c980d969db4e8c
DIST mysql-connector-odbc-8.0.23-src.tar.gz 3726277 BLAKE2B
21b5e6f3f7e77d6107268800441675a230c79071e52db39093fade6e02031c12c96371d165af9459e9739e069e5b4196f0169dff54c0fa300e7a3023e8a82722
SHA512
2f66b5e1796176d638b1209b7d3381c2600a11cc88fa0dfb1f29b16a6c59386926674d5581d4843036d061af09312d58620484730bd7cdad36c0a0dcd45d49a9
+DIST mysql-connector-odbc-8.0.24-src.tar.gz 3736373 BLAKE2B
8d03566471343239dd49f09bc02a0852f73544e0a91532e75d7871fa2842880213df0241691ab5449597bfed9dae3a74d87d2ed43092aad6bd66bee511542863
SHA512
1e182fd017092a47e38c96006a55d2d21496b2e5b67c211f9ea5b3c3cae44035bc9d401fc90c4f4e8ef6a347dbbbf78870b5dbc3711613fc28cddea468efa6f3
diff --git a/dev-db/myodbc/myodbc-8.0.24.ebuild
b/dev-db/myodbc/myodbc-8.0.24.ebuild
new file mode 100644
index 000..aca18615d23
--- /dev/null
+++ b/dev-db/myodbc/myodbc-8.0.24.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib
+
+MAJOR="$(ver_cut 1-2)"
+MY_PN="mysql-connector-odbc"
+MY_P="${MY_PN}-${PV/_p/r}-src"
+
+DESCRIPTION="ODBC driver for MySQL"
+HOMEPAGE="https://dev.mysql.com/downloads/connector/odbc/;
+SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="${MAJOR}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+# Broken when built dynamically against libmysqlclient.so
+RDEPEND="
+ dev-db/unixODBC[${MULTILIB_USEDEP}]
+ >=dev-db/mysql-connector-c-8.0:0=[static-libs,${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+S=${WORKDIR}/${MY_P}
+
+# Careful!
+DRIVER_NAME="${PN}-${SLOT}"
+
+# Patch document path so it doesn't install files to /usr
+PATCHES=(
+ "${FILESDIR}/${MAJOR}-cmake-doc-path.patch"
+ "${FILESDIR}/${PN}-8.0.19-cxxlinkage.patch"
+)
+
+src_prepare() {
+ # Remove Tests
+ sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
+ "${S}/CMakeLists.txt"
+
+ cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+ mycmakeargs+=(
+ -DMYSQLCLIENT_STATIC_LINKING=1
+ -DMYSQL_CXX_LINKAGE=1
+ -DWITH_UNIXODBC=1
+ -DWITH_DOCUMENTATION_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}
+ -DLIB_SUBDIR="$(get_libdir)/${PN}-${MAJOR}"
+ -DMYSQLCLIENT_NO_THREADS=ON
+ -DDISABLE_GUI=ON
+ # The NUMA and LIBWRAP options are not really used.
+ # They are just copied from the server code
+ -DWITH_NUMA=OFF
+ -DWITH_LIBWRAP=OFF
+ )
+ 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,lib/libmyodbc3.so,$(get_libdir)/${PN}-${MAJOR}/libmyodbc${SLOT:0:1}a.so,g" \
+ >"${D}"/usr/share/${PN}-${SLOT}/${i} \
+ <"${FILESDIR}"/${i}.m4 \
+ || die "Failed to build $i"
+ done
+
+ rm -rf "${ED}/usr/$(get_libdir)/${PN}-${MAJOR}/private" \
+ || die "failed to remove bundled libs"
+
+ 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
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: d9093c45786d0823e35f453c075f698384950b13
Author: Agostino Sarubbo gentoo org>
AuthorDate: Wed Feb 3 14:30:00 2021 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Wed Feb 3 14:30:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9093c45
dev-db/myodbc: x86 stable wrt bug #768231
Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
dev-db/myodbc/myodbc-8.0.23.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-db/myodbc/myodbc-8.0.23.ebuild
b/dev-db/myodbc/myodbc-8.0.23.ebuild
index 79c1e4a0c15..cb085f4c71c 100644
--- a/dev-db/myodbc/myodbc-8.0.23.ebuild
+++ b/dev-db/myodbc/myodbc-8.0.23.ebuild
@@ -15,7 +15,7 @@
SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar
LICENSE="GPL-2"
SLOT="${MAJOR}"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE=""
# Broken when built dynamically against libmysqlclient.so
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: a76cbe1bff8c46c0be8770e4e4c56770102ca1f4
Author: Agostino Sarubbo gentoo org>
AuthorDate: Wed Feb 3 14:27:54 2021 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Wed Feb 3 14:27:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a76cbe1b
dev-db/myodbc: amd64 stable wrt bug #768231
Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
dev-db/myodbc/myodbc-8.0.23.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-db/myodbc/myodbc-8.0.23.ebuild
b/dev-db/myodbc/myodbc-8.0.23.ebuild
index aca18615d23..79c1e4a0c15 100644
--- a/dev-db/myodbc/myodbc-8.0.23.ebuild
+++ b/dev-db/myodbc/myodbc-8.0.23.ebuild
@@ -15,7 +15,7 @@
SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar
LICENSE="GPL-2"
SLOT="${MAJOR}"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE=""
# Broken when built dynamically against libmysqlclient.so
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: b12fb32508bb5c981319ca7f3bd5bafae469d747
Author: Thomas Deutschmann gentoo org>
AuthorDate: Thu Jan 21 22:24:57 2021 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Jan 21 22:32:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b12fb325
dev-db/myodbc: don't install bundled files
Closes: https://bugs.gentoo.org/750506
Closes: https://bugs.gentoo.org/750500
Closes: https://bugs.gentoo.org/750497
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann gentoo.org>
dev-db/myodbc/myodbc-8.0.23.ebuild | 3 +++
1 file changed, 3 insertions(+)
diff --git a/dev-db/myodbc/myodbc-8.0.23.ebuild
b/dev-db/myodbc/myodbc-8.0.23.ebuild
index 4540db227dd..aca18615d23 100644
--- a/dev-db/myodbc/myodbc-8.0.23.ebuild
+++ b/dev-db/myodbc/myodbc-8.0.23.ebuild
@@ -75,6 +75,9 @@ multilib_src_install_all() {
|| die "Failed to build $i"
done
+ rm -rf "${ED}/usr/$(get_libdir)/${PN}-${MAJOR}/private" \
+ || die "failed to remove bundled libs"
+
mv "${D}/usr/bin/myodbc-installer" \
"${D}/usr/bin/myodbc-installer-${MAJOR}" || die "failed to move
slotted binary"
}
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: b8587de0e8a4fc635d42024fd8b78df50b004378
Author: Thomas Deutschmann gentoo org>
AuthorDate: Thu Jan 21 22:22:26 2021 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Jan 21 22:32:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8587de0
dev-db/myodbc: bump to v8.0.23
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann gentoo.org>
dev-db/myodbc/Manifest | 1 +
dev-db/myodbc/myodbc-8.0.23.ebuild | 119 +
2 files changed, 120 insertions(+)
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index 154b0e8832f..a46cf8c41c1 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -1 +1,2 @@
DIST mysql-connector-odbc-8.0.22-src.tar.gz 3726015 BLAKE2B
055920446767b0c9a30a0ca4773e71d662b398a9849df1a0b7975d71a21cfb23f540d8dda5430c717569f173e63673d3e51b025bb098e51202093d33e19bc142
SHA512
c613ae60346cea2e57bade89d813fd5ac21d0712d3d751e3acbc275421da6ac7593afc3da9fb6d161ee413f60e76e670f0c84876591f331925c980d969db4e8c
+DIST mysql-connector-odbc-8.0.23-src.tar.gz 3726277 BLAKE2B
21b5e6f3f7e77d6107268800441675a230c79071e52db39093fade6e02031c12c96371d165af9459e9739e069e5b4196f0169dff54c0fa300e7a3023e8a82722
SHA512
2f66b5e1796176d638b1209b7d3381c2600a11cc88fa0dfb1f29b16a6c59386926674d5581d4843036d061af09312d58620484730bd7cdad36c0a0dcd45d49a9
diff --git a/dev-db/myodbc/myodbc-8.0.23.ebuild
b/dev-db/myodbc/myodbc-8.0.23.ebuild
new file mode 100644
index 000..4540db227dd
--- /dev/null
+++ b/dev-db/myodbc/myodbc-8.0.23.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib
+
+MAJOR="$(ver_cut 1-2)"
+MY_PN="mysql-connector-odbc"
+MY_P="${MY_PN}-${PV/_p/r}-src"
+
+DESCRIPTION="ODBC driver for MySQL"
+HOMEPAGE="https://dev.mysql.com/downloads/connector/odbc/;
+SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="${MAJOR}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+# Broken when built dynamically against libmysqlclient.so
+RDEPEND="
+ dev-db/unixODBC[${MULTILIB_USEDEP}]
+ >=dev-db/mysql-connector-c-8.0:0=[static-libs,${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+S=${WORKDIR}/${MY_P}
+
+# Careful!
+DRIVER_NAME="${PN}-${SLOT}"
+
+# Patch document path so it doesn't install files to /usr
+PATCHES=(
+ "${FILESDIR}/${MAJOR}-cmake-doc-path.patch"
+ "${FILESDIR}/${PN}-8.0.19-cxxlinkage.patch"
+)
+
+src_prepare() {
+ # Remove Tests
+ sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
+ "${S}/CMakeLists.txt"
+
+ cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+ mycmakeargs+=(
+ -DMYSQLCLIENT_STATIC_LINKING=1
+ -DMYSQL_CXX_LINKAGE=1
+ -DWITH_UNIXODBC=1
+ -DWITH_DOCUMENTATION_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}
+ -DLIB_SUBDIR="$(get_libdir)/${PN}-${MAJOR}"
+ -DMYSQLCLIENT_NO_THREADS=ON
+ -DDISABLE_GUI=ON
+ # The NUMA and LIBWRAP options are not really used.
+ # They are just copied from the server code
+ -DWITH_NUMA=OFF
+ -DWITH_LIBWRAP=OFF
+ )
+ 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,lib/libmyodbc3.so,$(get_libdir)/${PN}-${MAJOR}/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
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: 16e84520543cbeed611e942d0e04ac6836d716e9
Author: Thomas Deutschmann gentoo org>
AuthorDate: Fri Nov 27 17:49:48 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Fri Nov 27 17:49:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16e84520
dev-db/myodbc: drop old
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann gentoo.org>
dev-db/myodbc/Manifest | 1 -
dev-db/myodbc/myodbc-8.0.21.ebuild | 118 -
2 files changed, 119 deletions(-)
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index aa38c614f9c..154b0e8832f 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -1,2 +1 @@
-DIST mysql-connector-odbc-8.0.21-src.tar.gz 3744268 BLAKE2B
d43942cc94858023ae0c2140ffba8a0a676a763b167ef4cbf500b2b9c14d2b3486696f68d03b2cc4607cb7f302e2af25f1e5ce564441ecf6d44a03874e489c07
SHA512
dca83db2ae25e08e44eaf814cad7234c8b17c2935de69bec7d238881404b2bc062fd7e28c626b594a062ee488123be545b9384742e09168e64a1423425a41c40
DIST mysql-connector-odbc-8.0.22-src.tar.gz 3726015 BLAKE2B
055920446767b0c9a30a0ca4773e71d662b398a9849df1a0b7975d71a21cfb23f540d8dda5430c717569f173e63673d3e51b025bb098e51202093d33e19bc142
SHA512
c613ae60346cea2e57bade89d813fd5ac21d0712d3d751e3acbc275421da6ac7593afc3da9fb6d161ee413f60e76e670f0c84876591f331925c980d969db4e8c
diff --git a/dev-db/myodbc/myodbc-8.0.21.ebuild
b/dev-db/myodbc/myodbc-8.0.21.ebuild
deleted file mode 100644
index 93159f140c9..000
--- a/dev-db/myodbc/myodbc-8.0.21.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-MAJOR="$(ver_cut 1-2)"
-MY_PN="mysql-connector-odbc"
-MY_P="${MY_PN}-${PV/_p/r}-src"
-
-DESCRIPTION="ODBC driver for MySQL"
-HOMEPAGE="https://dev.mysql.com/downloads/connector/odbc/;
-SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="${MAJOR}"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-# Broken when built dynamically against libmysqlclient.so
-RDEPEND="
- dev-db/unixODBC[${MULTILIB_USEDEP}]
- >=dev-db/mysql-connector-c-8.0:0=[static-libs,${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-S=${WORKDIR}/${MY_P}
-
-# Careful!
-DRIVER_NAME="${PN}-${SLOT}"
-
-# Patch document path so it doesn't install files to /usr
-PATCHES=(
- "${FILESDIR}/${MAJOR}-cmake-doc-path.patch"
- "${FILESDIR}/${PN}-8.0.19-cxxlinkage.patch"
-)
-
-src_prepare() {
- # Remove Tests
- sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
- "${S}/CMakeLists.txt"
-
- cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
- mycmakeargs+=(
- -DMYSQLCLIENT_STATIC_LINKING=1
- -DMYSQL_CXX_LINKAGE=1
- -DWITH_UNIXODBC=1
- -DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF}
- -DLIB_SUBDIR="$(get_libdir)/${PN}-${MAJOR}"
- -DMYSQLCLIENT_NO_THREADS=ON
- -DDISABLE_GUI=ON
- # The NUMA and LIBWRAP options are not really used.
- # They are just copied from the server code
- -DWITH_NUMA=OFF
- -DWITH_LIBWRAP=OFF
- )
- 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,lib/libmyodbc3.so,$(get_libdir)/${PN}-${MAJOR}/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
-
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: 44899e552e3a5082864c90a5f728c288b8368713
Author: Agostino Sarubbo gentoo org>
AuthorDate: Fri Nov 27 16:08:01 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Fri Nov 27 16:08:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44899e55
dev-db/myodbc: ppc stable wrt bug #756670
Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo gentoo.org>
dev-db/myodbc/myodbc-8.0.22.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-db/myodbc/myodbc-8.0.22.ebuild
b/dev-db/myodbc/myodbc-8.0.22.ebuild
index d068036b4fc..93159f140c9 100644
--- a/dev-db/myodbc/myodbc-8.0.22.ebuild
+++ b/dev-db/myodbc/myodbc-8.0.22.ebuild
@@ -15,7 +15,7 @@
SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar
LICENSE="GPL-2"
SLOT="${MAJOR}"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
IUSE=""
# Broken when built dynamically against libmysqlclient.so
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: bbf7a52dfc021d083ed09a9c7089ad2d97b9c283
Author: Agostino Sarubbo gentoo org>
AuthorDate: Fri Nov 27 16:01:41 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Fri Nov 27 16:04:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbf7a52d
dev-db/myodbc: amd64 stable wrt bug #756670
Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
dev-db/myodbc/myodbc-8.0.22.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-db/myodbc/myodbc-8.0.22.ebuild
b/dev-db/myodbc/myodbc-8.0.22.ebuild
index c328e984abb..d068036b4fc 100644
--- a/dev-db/myodbc/myodbc-8.0.22.ebuild
+++ b/dev-db/myodbc/myodbc-8.0.22.ebuild
@@ -15,7 +15,7 @@
SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar
LICENSE="GPL-2"
SLOT="${MAJOR}"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE=""
# Broken when built dynamically against libmysqlclient.so
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: ebb54218d07985830aba7331619edc1c7d520c9c
Author: Thomas Deutschmann gentoo org>
AuthorDate: Wed Nov 25 16:31:26 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Wed Nov 25 16:31:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebb54218
dev-db/myodbc: x86 stable (bug #756670)
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann gentoo.org>
dev-db/myodbc/myodbc-8.0.22.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-db/myodbc/myodbc-8.0.22.ebuild
b/dev-db/myodbc/myodbc-8.0.22.ebuild
index 4577fecc234..c328e984abb 100644
--- a/dev-db/myodbc/myodbc-8.0.22.ebuild
+++ b/dev-db/myodbc/myodbc-8.0.22.ebuild
@@ -15,7 +15,7 @@
SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar
LICENSE="GPL-2"
SLOT="${MAJOR}"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
IUSE=""
# Broken when built dynamically against libmysqlclient.so
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: d39e4953cd245432a188c84a1ae6a245b4a962cb
Author: Thomas Deutschmann gentoo org>
AuthorDate: Tue Oct 20 18:53:23 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Tue Oct 20 18:55:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d39e4953
dev-db/myodbc: bump to v8.0.22
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann gentoo.org>
dev-db/myodbc/Manifest | 1 +
dev-db/myodbc/myodbc-8.0.22.ebuild | 118 +
2 files changed, 119 insertions(+)
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index f7e37215e11..aa38c614f9c 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -1 +1,2 @@
DIST mysql-connector-odbc-8.0.21-src.tar.gz 3744268 BLAKE2B
d43942cc94858023ae0c2140ffba8a0a676a763b167ef4cbf500b2b9c14d2b3486696f68d03b2cc4607cb7f302e2af25f1e5ce564441ecf6d44a03874e489c07
SHA512
dca83db2ae25e08e44eaf814cad7234c8b17c2935de69bec7d238881404b2bc062fd7e28c626b594a062ee488123be545b9384742e09168e64a1423425a41c40
+DIST mysql-connector-odbc-8.0.22-src.tar.gz 3726015 BLAKE2B
055920446767b0c9a30a0ca4773e71d662b398a9849df1a0b7975d71a21cfb23f540d8dda5430c717569f173e63673d3e51b025bb098e51202093d33e19bc142
SHA512
c613ae60346cea2e57bade89d813fd5ac21d0712d3d751e3acbc275421da6ac7593afc3da9fb6d161ee413f60e76e670f0c84876591f331925c980d969db4e8c
diff --git a/dev-db/myodbc/myodbc-8.0.22.ebuild
b/dev-db/myodbc/myodbc-8.0.22.ebuild
new file mode 100644
index 000..4577fecc234
--- /dev/null
+++ b/dev-db/myodbc/myodbc-8.0.22.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib
+
+MAJOR="$(ver_cut 1-2)"
+MY_PN="mysql-connector-odbc"
+MY_P="${MY_PN}-${PV/_p/r}-src"
+
+DESCRIPTION="ODBC driver for MySQL"
+HOMEPAGE="https://dev.mysql.com/downloads/connector/odbc/;
+SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="${MAJOR}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+# Broken when built dynamically against libmysqlclient.so
+RDEPEND="
+ dev-db/unixODBC[${MULTILIB_USEDEP}]
+ >=dev-db/mysql-connector-c-8.0:0=[static-libs,${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+S=${WORKDIR}/${MY_P}
+
+# Careful!
+DRIVER_NAME="${PN}-${SLOT}"
+
+# Patch document path so it doesn't install files to /usr
+PATCHES=(
+ "${FILESDIR}/${MAJOR}-cmake-doc-path.patch"
+ "${FILESDIR}/${PN}-8.0.19-cxxlinkage.patch"
+)
+
+src_prepare() {
+ # Remove Tests
+ sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
+ "${S}/CMakeLists.txt"
+
+ cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+ mycmakeargs+=(
+ -DMYSQLCLIENT_STATIC_LINKING=1
+ -DMYSQL_CXX_LINKAGE=1
+ -DWITH_UNIXODBC=1
+ -DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF}
+ -DLIB_SUBDIR="$(get_libdir)/${PN}-${MAJOR}"
+ -DMYSQLCLIENT_NO_THREADS=ON
+ -DDISABLE_GUI=ON
+ # The NUMA and LIBWRAP options are not really used.
+ # They are just copied from the server code
+ -DWITH_NUMA=OFF
+ -DWITH_LIBWRAP=OFF
+ )
+ 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,lib/libmyodbc3.so,$(get_libdir)/${PN}-${MAJOR}/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
+
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/files/, dev-db/myodbc/
commit: 6b670c82939003d10b2fdce461926dd3dfa465e5
Author: Thomas Deutschmann gentoo org>
AuthorDate: Sun Aug 9 20:56:52 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sun Aug 9 20:56:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b670c82
dev-db/myodbc: drop old
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Thomas Deutschmann gentoo.org>
dev-db/myodbc/Manifest | 7 --
dev-db/myodbc/files/5.3-cmake-doc-path.patch | 43 -
dev-db/myodbc/files/5.3.10-cxxlinkage.patch | 29 --
dev-db/myodbc/files/5.3.10-mariadb.patch | 58
dev-db/myodbc/files/8.0.16-cxxlinkage.patch | 63 -
dev-db/myodbc/files/cmake-doc-path.patch | 43 -
dev-db/myodbc/myodbc-5.3.10-r3.ebuild| 130 ---
dev-db/myodbc/myodbc-5.3.9.ebuild| 112 ---
dev-db/myodbc/myodbc-8.0.16.ebuild | 119
dev-db/myodbc/myodbc-8.0.17.ebuild | 119
dev-db/myodbc/myodbc-8.0.19.ebuild | 118
dev-db/myodbc/myodbc-8.0.20.ebuild | 118
12 files changed, 959 deletions(-)
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index cc11ad47ca4..f7e37215e11 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -1,8 +1 @@
-DIST mysql-connector-odbc-5.3.10-src.tar.gz 2646571 BLAKE2B
e85e179ee8a54c8c98dd254e949c08227adc72141d52bc15935eafd60edaf95f47c12ca51fa9472ae29c761d5de2149277c58e6d3f02a58be17f595ca7ba
SHA512
ebe56b95a1690332959a7a37e8ed381b46730fb9f6fbd6522ddc1a6961e4c8cdac59681a957b33abeb6cae12f210278e4063daa59ce952d92acf427bc188e22b
-DIST mysql-connector-odbc-5.3.9-linux-debian9-x86-32bit.tar.gz 11501665
BLAKE2B
e41dd65d940c0c91c67e6ec4c46ea2c3327e96d372c493635d05833862f2aa73919410a9e9a9c090a6fa65fd29e022a9b088c07a5e11089aee04b3b86005ad1e
SHA512
02fcf6ac88f6052206aa55b6fc2b37f499da26e596e8e64b1c20e87dc4a24f745416da56c6e1268feff60321f54cb45864b8d34e055ea2f99da37b6efeedc844
-DIST mysql-connector-odbc-5.3.9-linux-debian9-x86-64bit.tar.gz 12013057
BLAKE2B
e372cfb6ca49f9f01e9e60d7cd497fc009ec38dee76ca2cfb74cc95213b84ef1eebca85e1400f19c9715c0f9b2ef40fc212196e14189f5506be8d0e887507ce4
SHA512
b54ca167f762b4d8b988b4a91f14dc6a4bf49f55bc639ce8eecc9eba6c11400bd3494d74ef77ebe3348bdefd8fb5b8c1b62b3a6beebb926a1899da17ea4a1b44
-DIST mysql-connector-odbc-8.0.16-src.tar.gz 3986610 BLAKE2B
c91760f8e0352a57adb5400700d22f52f70d5210d85ff0932f5288f19c917c771ce9ea9abad097d27a9723c585d1029d56c09f6865f634f9c41ad852690e016d
SHA512
b7ddcdf635441bc3ed0325a8562f453e42d3c9768b0fe0b42d9b5417e268f4631e3fca3c2adc417c124ede37254c7b1890c792593d846ecaf5b158ce4b4808cd
-DIST mysql-connector-odbc-8.0.17-src.tar.gz 3953949 BLAKE2B
6d7fcef89c15d9f421f690291e793f1020b5f77f5e2132f130becd1ceed041887ffce77fda4cbc411d06972f1d488d434c8f132c0778af30a436c6b6e372e59e
SHA512
474b107eb5d4c23e10c24dcf37b3787418afbd34ea385791fd0d8cdb5d29a6770cde4a61e3591329b344c442ff8f6daad3a2c250e881f9f5837eaa4e951af7e4
-DIST mysql-connector-odbc-8.0.19-src.tar.gz 3770465 BLAKE2B
7c57d85c13c17c08e1aed1deff3d60851ff68474c42971ea796fc50e3b766d7c49e5d993527691534c30f4007a94be852ac240bf50244cd3adf0f9500fbfc68c
SHA512
4761d9d3eeccc932bfd76b9b27be4672e65b6125e85312dcfcb0b8b3cfe0ccf19982d40b2f85ae26e936e968d35d3136bab201b7dcb47eb4ad460c178c0d9f88
-DIST mysql-connector-odbc-8.0.20-src.tar.gz 3734268 BLAKE2B
606e8fe88712371da74bee8f44b21a56a2572603b1af693733fdd9ccd7ab62cb16a224593b368a40a021ed87ee433213a1a03b775c07b6bd28bbc44b7f905288
SHA512
483eb5c1d4a75ec4ec8681b33633bf89db708737191d149e1fed3c8bf0f839ab70951982a664fbf078c73fdfc114b126b5146682238faa244c904becf80858d7
DIST mysql-connector-odbc-8.0.21-src.tar.gz 3744268 BLAKE2B
d43942cc94858023ae0c2140ffba8a0a676a763b167ef4cbf500b2b9c14d2b3486696f68d03b2cc4607cb7f302e2af25f1e5ce564441ecf6d44a03874e489c07
SHA512
dca83db2ae25e08e44eaf814cad7234c8b17c2935de69bec7d238881404b2bc062fd7e28c626b594a062ee488123be545b9384742e09168e64a1423425a41c40
diff --git a/dev-db/myodbc/files/5.3-cmake-doc-path.patch
b/dev-db/myodbc/files/5.3-cmake-doc-path.patch
deleted file mode 100644
index 54f35d41d96..000
--- a/dev-db/myodbc/files/5.3-cmake-doc-path.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-=== modified file 'CMakeLists.txt'
a/CMakeLists.txt 2013-03-09 09:51:06 +
-+++ b/CMakeLists.txt 2013-03-09 11:05:27 +
-@@ -33,6 +33,12 @@
-
- INCLUDE(version.cmake)
-
-+IF(WITH_DOCUMENTATION_INSTALL_PATH)
-+ set(DOCUMENTATION_INSTALL_PATH ${WITH_DOCUMENTATION_INSTALL_PATH})
-+ELSE(WITH_DOCUMENTATION_INSTALL_PATH)
-+ set(DOCUMENTATION_INSTALL_PATH
${CMAKE_INSTALL_PREFIX}/share/doc/myodbc-${CONNECTOR_MAJOR}.${CONNECTOR_MINOR})
-+ENDIF(WITH_DOCUMENTATION_INSTALL_PATH)
-+
- #Default is to build both drivers
- IF(UNICODE OR NOT ANSI)
- MESSAGE(STATUS "Configuring to build
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: e80418c92a3dda9ea0c2c1013b98203d2498ed55
Author: Agostino Sarubbo gentoo org>
AuthorDate: Fri Aug 7 11:53:00 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Fri Aug 7 11:53:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e80418c9
dev-db/myodbc: x86 stable wrt bug #736070
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
dev-db/myodbc/myodbc-8.0.21.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-db/myodbc/myodbc-8.0.21.ebuild
b/dev-db/myodbc/myodbc-8.0.21.ebuild
index 409b7eb1b65..93159f140c9 100644
--- a/dev-db/myodbc/myodbc-8.0.21.ebuild
+++ b/dev-db/myodbc/myodbc-8.0.21.ebuild
@@ -15,7 +15,7 @@
SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar
LICENSE="GPL-2"
SLOT="${MAJOR}"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
IUSE=""
# Broken when built dynamically against libmysqlclient.so
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: e6a7f2f7cd7c2bdd738361ae24eab540330a32dd
Author: Agostino Sarubbo gentoo org>
AuthorDate: Fri Aug 7 11:44:02 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Fri Aug 7 11:44:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6a7f2f7
dev-db/myodbc: amd64 stable wrt bug #736070
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
dev-db/myodbc/myodbc-8.0.21.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-db/myodbc/myodbc-8.0.21.ebuild
b/dev-db/myodbc/myodbc-8.0.21.ebuild
index b27e516be3b..409b7eb1b65 100644
--- a/dev-db/myodbc/myodbc-8.0.21.ebuild
+++ b/dev-db/myodbc/myodbc-8.0.21.ebuild
@@ -15,7 +15,7 @@
SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar
LICENSE="GPL-2"
SLOT="${MAJOR}"
-KEYWORDS="~amd64 ppc ~x86"
+KEYWORDS="amd64 ppc ~x86"
IUSE=""
# Broken when built dynamically against libmysqlclient.so
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: a885e621a170538740ee54d8950f0a3767505e85
Author: Agostino Sarubbo gentoo org>
AuthorDate: Thu Aug 6 11:48:59 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Thu Aug 6 11:48:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a885e621
dev-db/myodbc: ppc stable wrt bug #736070
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo gentoo.org>
dev-db/myodbc/myodbc-8.0.21.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-db/myodbc/myodbc-8.0.21.ebuild
b/dev-db/myodbc/myodbc-8.0.21.ebuild
index 4577fecc234..b27e516be3b 100644
--- a/dev-db/myodbc/myodbc-8.0.21.ebuild
+++ b/dev-db/myodbc/myodbc-8.0.21.ebuild
@@ -15,7 +15,7 @@
SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar
LICENSE="GPL-2"
SLOT="${MAJOR}"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc ~x86"
IUSE=""
# Broken when built dynamically against libmysqlclient.so
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: 80b63319b112bfe94c9075c7c26e04d3a8a25af7
Author: Thomas Deutschmann gentoo org>
AuthorDate: Sun Jul 26 01:36:45 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sun Jul 26 01:46:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80b63319
dev-db/myodbc: bump to v8.0.21
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Thomas Deutschmann gentoo.org>
dev-db/myodbc/Manifest | 1 +
dev-db/myodbc/myodbc-8.0.21.ebuild | 118 +
2 files changed, 119 insertions(+)
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index b08ad26d298..cc11ad47ca4 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -5,3 +5,4 @@ DIST mysql-connector-odbc-8.0.16-src.tar.gz 3986610 BLAKE2B
c91760f8e0352a57adb5
DIST mysql-connector-odbc-8.0.17-src.tar.gz 3953949 BLAKE2B
6d7fcef89c15d9f421f690291e793f1020b5f77f5e2132f130becd1ceed041887ffce77fda4cbc411d06972f1d488d434c8f132c0778af30a436c6b6e372e59e
SHA512
474b107eb5d4c23e10c24dcf37b3787418afbd34ea385791fd0d8cdb5d29a6770cde4a61e3591329b344c442ff8f6daad3a2c250e881f9f5837eaa4e951af7e4
DIST mysql-connector-odbc-8.0.19-src.tar.gz 3770465 BLAKE2B
7c57d85c13c17c08e1aed1deff3d60851ff68474c42971ea796fc50e3b766d7c49e5d993527691534c30f4007a94be852ac240bf50244cd3adf0f9500fbfc68c
SHA512
4761d9d3eeccc932bfd76b9b27be4672e65b6125e85312dcfcb0b8b3cfe0ccf19982d40b2f85ae26e936e968d35d3136bab201b7dcb47eb4ad460c178c0d9f88
DIST mysql-connector-odbc-8.0.20-src.tar.gz 3734268 BLAKE2B
606e8fe88712371da74bee8f44b21a56a2572603b1af693733fdd9ccd7ab62cb16a224593b368a40a021ed87ee433213a1a03b775c07b6bd28bbc44b7f905288
SHA512
483eb5c1d4a75ec4ec8681b33633bf89db708737191d149e1fed3c8bf0f839ab70951982a664fbf078c73fdfc114b126b5146682238faa244c904becf80858d7
+DIST mysql-connector-odbc-8.0.21-src.tar.gz 3744268 BLAKE2B
d43942cc94858023ae0c2140ffba8a0a676a763b167ef4cbf500b2b9c14d2b3486696f68d03b2cc4607cb7f302e2af25f1e5ce564441ecf6d44a03874e489c07
SHA512
dca83db2ae25e08e44eaf814cad7234c8b17c2935de69bec7d238881404b2bc062fd7e28c626b594a062ee488123be545b9384742e09168e64a1423425a41c40
diff --git a/dev-db/myodbc/myodbc-8.0.21.ebuild
b/dev-db/myodbc/myodbc-8.0.21.ebuild
new file mode 100644
index 000..4577fecc234
--- /dev/null
+++ b/dev-db/myodbc/myodbc-8.0.21.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib
+
+MAJOR="$(ver_cut 1-2)"
+MY_PN="mysql-connector-odbc"
+MY_P="${MY_PN}-${PV/_p/r}-src"
+
+DESCRIPTION="ODBC driver for MySQL"
+HOMEPAGE="https://dev.mysql.com/downloads/connector/odbc/;
+SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="${MAJOR}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+# Broken when built dynamically against libmysqlclient.so
+RDEPEND="
+ dev-db/unixODBC[${MULTILIB_USEDEP}]
+ >=dev-db/mysql-connector-c-8.0:0=[static-libs,${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+S=${WORKDIR}/${MY_P}
+
+# Careful!
+DRIVER_NAME="${PN}-${SLOT}"
+
+# Patch document path so it doesn't install files to /usr
+PATCHES=(
+ "${FILESDIR}/${MAJOR}-cmake-doc-path.patch"
+ "${FILESDIR}/${PN}-8.0.19-cxxlinkage.patch"
+)
+
+src_prepare() {
+ # Remove Tests
+ sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
+ "${S}/CMakeLists.txt"
+
+ cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+ mycmakeargs+=(
+ -DMYSQLCLIENT_STATIC_LINKING=1
+ -DMYSQL_CXX_LINKAGE=1
+ -DWITH_UNIXODBC=1
+ -DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF}
+ -DLIB_SUBDIR="$(get_libdir)/${PN}-${MAJOR}"
+ -DMYSQLCLIENT_NO_THREADS=ON
+ -DDISABLE_GUI=ON
+ # The NUMA and LIBWRAP options are not really used.
+ # They are just copied from the server code
+ -DWITH_NUMA=OFF
+ -DWITH_LIBWRAP=OFF
+ )
+ 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,lib/libmyodbc3.so,$(get_libdir)/${PN}-${MAJOR}/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
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: 50d3306a1f8af67662e85ac1ecef9e582e60318a
Author: Thomas Deutschmann gentoo org>
AuthorDate: Sat May 23 20:53:10 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sat May 23 20:53:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50d3306a
dev-db/myodbc: bump to v8.0.20
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann gentoo.org>
dev-db/myodbc/Manifest | 1 +
dev-db/myodbc/myodbc-8.0.20.ebuild | 118 +
2 files changed, 119 insertions(+)
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index 0be45e21dbe..b08ad26d298 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -4,3 +4,4 @@ DIST mysql-connector-odbc-5.3.9-linux-debian9-x86-64bit.tar.gz
12013057 BLAKE2B
DIST mysql-connector-odbc-8.0.16-src.tar.gz 3986610 BLAKE2B
c91760f8e0352a57adb5400700d22f52f70d5210d85ff0932f5288f19c917c771ce9ea9abad097d27a9723c585d1029d56c09f6865f634f9c41ad852690e016d
SHA512
b7ddcdf635441bc3ed0325a8562f453e42d3c9768b0fe0b42d9b5417e268f4631e3fca3c2adc417c124ede37254c7b1890c792593d846ecaf5b158ce4b4808cd
DIST mysql-connector-odbc-8.0.17-src.tar.gz 3953949 BLAKE2B
6d7fcef89c15d9f421f690291e793f1020b5f77f5e2132f130becd1ceed041887ffce77fda4cbc411d06972f1d488d434c8f132c0778af30a436c6b6e372e59e
SHA512
474b107eb5d4c23e10c24dcf37b3787418afbd34ea385791fd0d8cdb5d29a6770cde4a61e3591329b344c442ff8f6daad3a2c250e881f9f5837eaa4e951af7e4
DIST mysql-connector-odbc-8.0.19-src.tar.gz 3770465 BLAKE2B
7c57d85c13c17c08e1aed1deff3d60851ff68474c42971ea796fc50e3b766d7c49e5d993527691534c30f4007a94be852ac240bf50244cd3adf0f9500fbfc68c
SHA512
4761d9d3eeccc932bfd76b9b27be4672e65b6125e85312dcfcb0b8b3cfe0ccf19982d40b2f85ae26e936e968d35d3136bab201b7dcb47eb4ad460c178c0d9f88
+DIST mysql-connector-odbc-8.0.20-src.tar.gz 3734268 BLAKE2B
606e8fe88712371da74bee8f44b21a56a2572603b1af693733fdd9ccd7ab62cb16a224593b368a40a021ed87ee433213a1a03b775c07b6bd28bbc44b7f905288
SHA512
483eb5c1d4a75ec4ec8681b33633bf89db708737191d149e1fed3c8bf0f839ab70951982a664fbf078c73fdfc114b126b5146682238faa244c904becf80858d7
diff --git a/dev-db/myodbc/myodbc-8.0.20.ebuild
b/dev-db/myodbc/myodbc-8.0.20.ebuild
new file mode 100644
index 000..4577fecc234
--- /dev/null
+++ b/dev-db/myodbc/myodbc-8.0.20.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib
+
+MAJOR="$(ver_cut 1-2)"
+MY_PN="mysql-connector-odbc"
+MY_P="${MY_PN}-${PV/_p/r}-src"
+
+DESCRIPTION="ODBC driver for MySQL"
+HOMEPAGE="https://dev.mysql.com/downloads/connector/odbc/;
+SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="${MAJOR}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+# Broken when built dynamically against libmysqlclient.so
+RDEPEND="
+ dev-db/unixODBC[${MULTILIB_USEDEP}]
+ >=dev-db/mysql-connector-c-8.0:0=[static-libs,${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+S=${WORKDIR}/${MY_P}
+
+# Careful!
+DRIVER_NAME="${PN}-${SLOT}"
+
+# Patch document path so it doesn't install files to /usr
+PATCHES=(
+ "${FILESDIR}/${MAJOR}-cmake-doc-path.patch"
+ "${FILESDIR}/${PN}-8.0.19-cxxlinkage.patch"
+)
+
+src_prepare() {
+ # Remove Tests
+ sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
+ "${S}/CMakeLists.txt"
+
+ cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+ mycmakeargs+=(
+ -DMYSQLCLIENT_STATIC_LINKING=1
+ -DMYSQL_CXX_LINKAGE=1
+ -DWITH_UNIXODBC=1
+ -DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF}
+ -DLIB_SUBDIR="$(get_libdir)/${PN}-${MAJOR}"
+ -DMYSQLCLIENT_NO_THREADS=ON
+ -DDISABLE_GUI=ON
+ # The NUMA and LIBWRAP options are not really used.
+ # They are just copied from the server code
+ -DWITH_NUMA=OFF
+ -DWITH_LIBWRAP=OFF
+ )
+ 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,lib/libmyodbc3.so,$(get_libdir)/${PN}-${MAJOR}/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
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: b941846518e535c6d4c57bedc091fd9b699aea0e
Author: Agostino Sarubbo gentoo org>
AuthorDate: Tue Feb 18 09:54:38 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Tue Feb 18 09:54:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9418465
dev-db/myodbc: ppc stable wrt bug #709626
Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo gentoo.org>
dev-db/myodbc/myodbc-8.0.19.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-db/myodbc/myodbc-8.0.19.ebuild
b/dev-db/myodbc/myodbc-8.0.19.ebuild
index d068036b4fc..93159f140c9 100644
--- a/dev-db/myodbc/myodbc-8.0.19.ebuild
+++ b/dev-db/myodbc/myodbc-8.0.19.ebuild
@@ -15,7 +15,7 @@
SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar
LICENSE="GPL-2"
SLOT="${MAJOR}"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
IUSE=""
# Broken when built dynamically against libmysqlclient.so
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: 88d655af34d0ee755e36b2cea34022208839982f
Author: Thomas Deutschmann gentoo org>
AuthorDate: Sun Feb 16 21:00:32 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sun Feb 16 21:13:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88d655af
dev-db/myodbc: x86 stable (bug #709626)
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Thomas Deutschmann gentoo.org>
dev-db/myodbc/myodbc-8.0.19.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-db/myodbc/myodbc-8.0.19.ebuild
b/dev-db/myodbc/myodbc-8.0.19.ebuild
index 3169a866ecc..d068036b4fc 100644
--- a/dev-db/myodbc/myodbc-8.0.19.ebuild
+++ b/dev-db/myodbc/myodbc-8.0.19.ebuild
@@ -15,7 +15,7 @@
SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar
LICENSE="GPL-2"
SLOT="${MAJOR}"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE=""
# Broken when built dynamically against libmysqlclient.so
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: 6e65aaae32b671db408e1095aca32be01a671e62
Author: Mikle Kolyada gentoo org>
AuthorDate: Sat Feb 15 12:14:51 2020 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sat Feb 15 12:14:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e65aaae
dev-db/myodbc: amd64 stable wrt bug #709626
Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Mikle Kolyada gentoo.org>
dev-db/myodbc/myodbc-8.0.19.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-db/myodbc/myodbc-8.0.19.ebuild
b/dev-db/myodbc/myodbc-8.0.19.ebuild
index 4577fecc234..3169a866ecc 100644
--- a/dev-db/myodbc/myodbc-8.0.19.ebuild
+++ b/dev-db/myodbc/myodbc-8.0.19.ebuild
@@ -15,7 +15,7 @@
SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar
LICENSE="GPL-2"
SLOT="${MAJOR}"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE=""
# Broken when built dynamically against libmysqlclient.so
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/, dev-db/myodbc/files/
commit: 971857a38729c0e0c48014d70d995b981c25a78a
Author: Thomas Deutschmann gentoo org>
AuthorDate: Thu Jan 23 01:28:11 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Jan 23 01:30:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=971857a3
dev-db/myodbc: bump to v8.0.19
Signed-off-by: Thomas Deutschmann gentoo.org>
dev-db/myodbc/Manifest | 1 +
dev-db/myodbc/files/myodbc-8.0.19-cxxlinkage.patch | 27 +
dev-db/myodbc/myodbc-8.0.19.ebuild | 118 +
3 files changed, 146 insertions(+)
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index a7f7a463760..0be45e21dbe 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -3,3 +3,4 @@ DIST mysql-connector-odbc-5.3.9-linux-debian9-x86-32bit.tar.gz
11501665 BLAKE2B
DIST mysql-connector-odbc-5.3.9-linux-debian9-x86-64bit.tar.gz 12013057
BLAKE2B
e372cfb6ca49f9f01e9e60d7cd497fc009ec38dee76ca2cfb74cc95213b84ef1eebca85e1400f19c9715c0f9b2ef40fc212196e14189f5506be8d0e887507ce4
SHA512
b54ca167f762b4d8b988b4a91f14dc6a4bf49f55bc639ce8eecc9eba6c11400bd3494d74ef77ebe3348bdefd8fb5b8c1b62b3a6beebb926a1899da17ea4a1b44
DIST mysql-connector-odbc-8.0.16-src.tar.gz 3986610 BLAKE2B
c91760f8e0352a57adb5400700d22f52f70d5210d85ff0932f5288f19c917c771ce9ea9abad097d27a9723c585d1029d56c09f6865f634f9c41ad852690e016d
SHA512
b7ddcdf635441bc3ed0325a8562f453e42d3c9768b0fe0b42d9b5417e268f4631e3fca3c2adc417c124ede37254c7b1890c792593d846ecaf5b158ce4b4808cd
DIST mysql-connector-odbc-8.0.17-src.tar.gz 3953949 BLAKE2B
6d7fcef89c15d9f421f690291e793f1020b5f77f5e2132f130becd1ceed041887ffce77fda4cbc411d06972f1d488d434c8f132c0778af30a436c6b6e372e59e
SHA512
474b107eb5d4c23e10c24dcf37b3787418afbd34ea385791fd0d8cdb5d29a6770cde4a61e3591329b344c442ff8f6daad3a2c250e881f9f5837eaa4e951af7e4
+DIST mysql-connector-odbc-8.0.19-src.tar.gz 3770465 BLAKE2B
7c57d85c13c17c08e1aed1deff3d60851ff68474c42971ea796fc50e3b766d7c49e5d993527691534c30f4007a94be852ac240bf50244cd3adf0f9500fbfc68c
SHA512
4761d9d3eeccc932bfd76b9b27be4672e65b6125e85312dcfcb0b8b3cfe0ccf19982d40b2f85ae26e936e968d35d3136bab201b7dcb47eb4ad460c178c0d9f88
diff --git a/dev-db/myodbc/files/myodbc-8.0.19-cxxlinkage.patch
b/dev-db/myodbc/files/myodbc-8.0.19-cxxlinkage.patch
new file mode 100644
index 000..f26b27417c1
--- /dev/null
+++ b/dev-db/myodbc/files/myodbc-8.0.19-cxxlinkage.patch
@@ -0,0 +1,27 @@
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -454,10 +454,9 @@ endmacro()
+ 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|aarch64)")
+- 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}")
+
+--- a/cmake/FindMySQL.cmake
b/cmake/FindMySQL.cmake
+@@ -805,7 +805,7 @@ if(NOT WIN32)
+ endif()
+
+ if(NOT MYSQL_CXXFLAGS)
+- if(MYSQL_CXX_LINKAGE OR MYSQL_VERSION_ID GREATER 50603)
++ if(MYSQL_CXX_LINKAGE)
+ _mysql_conf(MYSQL_CXXFLAGS "--cxxflags")
+ set(MYSQL_CXX_LINKAGE 1)
+ else()
diff --git a/dev-db/myodbc/myodbc-8.0.19.ebuild
b/dev-db/myodbc/myodbc-8.0.19.ebuild
new file mode 100644
index 000..e6635dadba1
--- /dev/null
+++ b/dev-db/myodbc/myodbc-8.0.19.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib
+
+MAJOR="$(ver_cut 1-2)"
+MY_PN="mysql-connector-odbc"
+MY_P="${MY_PN}-${PV/_p/r}-src"
+
+DESCRIPTION="ODBC driver for MySQL"
+HOMEPAGE="https://dev.mysql.com/downloads/connector/odbc/;
+SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="${MAJOR}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+# Broken when built dynamically against libmysqlclient.so
+RDEPEND="
+ dev-db/unixODBC[${MULTILIB_USEDEP}]
+ >=dev-db/mysql-connector-c-8.0:0=[static-libs,${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+S=${WORKDIR}/${MY_P}
+
+# Careful!
+DRIVER_NAME="${PN}-${SLOT}"
+
+# Patch document path so it doesn't install files to /usr
+PATCHES=(
+ "${FILESDIR}/${MAJOR}-cmake-doc-path.patch"
+ "${FILESDIR}/${PN}-8.0.19-cxxlinkage.patch"
+)
+
+src_prepare() {
+ # Remove Tests
+ sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
+ "${S}/CMakeLists.txt"
+
+ cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+ mycmakeargs+=(
+ -DMYSQLCLIENT_STATIC_LINKING=1
+ -DMYSQL_CXX_LINKAGE=1
+ -DWITH_UNIXODBC=1
+ -DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF}
+ -DLIB_SUBDIR="$(get_libdir)/${PN}-${MAJOR}"
+ -DMYSQLCLIENT_NO_THREADS=ON
+
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: 5a9ae6e84952723c20132860a0301622f87910cd
Author: Thomas Deutschmann gentoo org>
AuthorDate: Wed Aug 28 11:08:06 2019 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Wed Aug 28 11:17:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a9ae6e8
dev-db/myodbc: rev bump to ease migration to dev-db/mysql-connector-c
Commit e86f812ab4677da3ba7d70d8d104c1dec4461710 replaced
virtual/libmysqlclient dependency with dev-db/mysql-connector-c atom
without a rev bump.
To avoid unecessary user interaction for users not using emerge's
--changed-deps=y because we are already pushing towards removal of
virtual/libmysqlclient (see commit 08b83d736f77fd5dffa9cd5f6b1b44771726ce94),
this commit will now force the re-installation through rev bump
to ease migration.
Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann gentoo.org>
dev-db/myodbc/{myodbc-5.3.10-r2.ebuild => myodbc-5.3.10-r3.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/dev-db/myodbc/myodbc-5.3.10-r2.ebuild
b/dev-db/myodbc/myodbc-5.3.10-r3.ebuild
similarity index 100%
rename from dev-db/myodbc/myodbc-5.3.10-r2.ebuild
rename to dev-db/myodbc/myodbc-5.3.10-r3.ebuild
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: e86f812ab4677da3ba7d70d8d104c1dec4461710
Author: Thomas Deutschmann gentoo org>
AuthorDate: Sat Aug 24 09:41:52 2019 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sat Aug 24 10:30:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e86f812a
dev-db/myodbc: migrate to dev-db/mysql-connector-c
Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann gentoo.org>
dev-db/myodbc/myodbc-5.3.10-r2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-db/myodbc/myodbc-5.3.10-r2.ebuild
b/dev-db/myodbc/myodbc-5.3.10-r2.ebuild
index 28dde7ddccb..ffae941ae9e 100644
--- a/dev-db/myodbc/myodbc-5.3.10-r2.ebuild
+++ b/dev-db/myodbc/myodbc-5.3.10-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -24,7 +24,7 @@ IUSE=""
# Does not build with libmariadb
RDEPEND="
dev-db/unixODBC[${MULTILIB_USEDEP}]
- ~virtual/libmysqlclient-18[${MULTILIB_USEDEP}]
+ =dev-db/mariadb-10.2.0[client-libs(+)]
!dev-db/mariadb-connector-c[mysqlcompat(-)]
"
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: 868adefd371f26400cd50860866c9bde0a4aca62
Author: Thomas Deutschmann gentoo org>
AuthorDate: Sat Aug 17 13:12:50 2019 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sat Aug 17 13:45:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=868adefd
dev-db/myodbc: bump to v8.0.17
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann gentoo.org>
dev-db/myodbc/Manifest | 1 +
dev-db/myodbc/myodbc-8.0.17.ebuild | 119 +
2 files changed, 120 insertions(+)
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index da72be6d266..a7f7a463760 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -2,3 +2,4 @@ DIST mysql-connector-odbc-5.3.10-src.tar.gz 2646571 BLAKE2B
e85e179ee8a54c8c98dd
DIST mysql-connector-odbc-5.3.9-linux-debian9-x86-32bit.tar.gz 11501665
BLAKE2B
e41dd65d940c0c91c67e6ec4c46ea2c3327e96d372c493635d05833862f2aa73919410a9e9a9c090a6fa65fd29e022a9b088c07a5e11089aee04b3b86005ad1e
SHA512
02fcf6ac88f6052206aa55b6fc2b37f499da26e596e8e64b1c20e87dc4a24f745416da56c6e1268feff60321f54cb45864b8d34e055ea2f99da37b6efeedc844
DIST mysql-connector-odbc-5.3.9-linux-debian9-x86-64bit.tar.gz 12013057
BLAKE2B
e372cfb6ca49f9f01e9e60d7cd497fc009ec38dee76ca2cfb74cc95213b84ef1eebca85e1400f19c9715c0f9b2ef40fc212196e14189f5506be8d0e887507ce4
SHA512
b54ca167f762b4d8b988b4a91f14dc6a4bf49f55bc639ce8eecc9eba6c11400bd3494d74ef77ebe3348bdefd8fb5b8c1b62b3a6beebb926a1899da17ea4a1b44
DIST mysql-connector-odbc-8.0.16-src.tar.gz 3986610 BLAKE2B
c91760f8e0352a57adb5400700d22f52f70d5210d85ff0932f5288f19c917c771ce9ea9abad097d27a9723c585d1029d56c09f6865f634f9c41ad852690e016d
SHA512
b7ddcdf635441bc3ed0325a8562f453e42d3c9768b0fe0b42d9b5417e268f4631e3fca3c2adc417c124ede37254c7b1890c792593d846ecaf5b158ce4b4808cd
+DIST mysql-connector-odbc-8.0.17-src.tar.gz 3953949 BLAKE2B
6d7fcef89c15d9f421f690291e793f1020b5f77f5e2132f130becd1ceed041887ffce77fda4cbc411d06972f1d488d434c8f132c0778af30a436c6b6e372e59e
SHA512
474b107eb5d4c23e10c24dcf37b3787418afbd34ea385791fd0d8cdb5d29a6770cde4a61e3591329b344c442ff8f6daad3a2c250e881f9f5837eaa4e951af7e4
diff --git a/dev-db/myodbc/myodbc-8.0.17.ebuild
b/dev-db/myodbc/myodbc-8.0.17.ebuild
new file mode 100644
index 000..aabca64a42a
--- /dev/null
+++ b/dev-db/myodbc/myodbc-8.0.17.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib
+
+MAJOR="$(ver_cut 1-2)"
+MY_PN="mysql-connector-odbc"
+MY_P="${MY_PN}-${PV/_p/r}-src"
+
+DESCRIPTION="ODBC driver for MySQL"
+HOMEPAGE="https://dev.mysql.com/downloads/connector/odbc/;
+SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="${MAJOR}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+# Broken when built dynamically against libmysqlclient.so
+RDEPEND="
+ dev-db/unixODBC[${MULTILIB_USEDEP}]
+ >=dev-db/mysql-connector-c-8.0:0=[static-libs,${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+S=${WORKDIR}/${MY_P}
+
+# Careful!
+DRIVER_NAME="${PN}-${SLOT}"
+
+# Patch document path so it doesn't install files to /usr
+PATCHES=(
+ "${FILESDIR}/${MAJOR}-cmake-doc-path.patch"
+ "${FILESDIR}/8.0.16-cxxlinkage.patch"
+)
+
+src_prepare() {
+ # Remove Tests
+ sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
+ "${S}/CMakeLists.txt"
+
+ cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+ mycmakeargs+=(
+ -DMYSQLCLIENT_STATIC_LINKING=1
+ -DMYSQL_CXX_LINKAGE=1
+ -DWITH_UNIXODBC=1
+ -DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF}
+ -DLIB_SUBDIR="$(get_libdir)/${PN}-${MAJOR}"
+ -DMYSQLCLIENT_NO_THREADS=ON
+ -DDISABLE_GUI=ON
+ # The NUMA and LIBWRAP options are not really used.
+ # They are just copied from the server code
+ -DWITH_NUMA=OFF
+ -DWITH_LIBWRAP=OFF
+ )
+ 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,lib/libmyodbc3.so,$(get_libdir)/${PN}-${MAJOR}/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,
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/, dev-db/myodbc/files/
commit: 1237cc0efb7475c04d0d2dbfe4c31220d6bfecff
Author: Brian Evans gentoo org>
AuthorDate: Tue Jun 11 19:01:57 2019 +
Commit: Brian Evans gentoo org>
CommitDate: Tue Jun 11 19:01:57 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1237cc0e
dev-db/myodbc: Version bump for 8.0.16
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Brian Evans gentoo.org>
dev-db/myodbc/Manifest | 1 +
dev-db/myodbc/files/8.0-cmake-doc-path.patch | 42 ++
dev-db/myodbc/files/8.0.16-cxxlinkage.patch | 63 ++
dev-db/myodbc/myodbc-8.0.16.ebuild | 119 +++
4 files changed, 225 insertions(+)
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index a3791a4441a..da72be6d266 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -1,3 +1,4 @@
DIST mysql-connector-odbc-5.3.10-src.tar.gz 2646571 BLAKE2B
e85e179ee8a54c8c98dd254e949c08227adc72141d52bc15935eafd60edaf95f47c12ca51fa9472ae29c761d5de2149277c58e6d3f02a58be17f595ca7ba
SHA512
ebe56b95a1690332959a7a37e8ed381b46730fb9f6fbd6522ddc1a6961e4c8cdac59681a957b33abeb6cae12f210278e4063daa59ce952d92acf427bc188e22b
DIST mysql-connector-odbc-5.3.9-linux-debian9-x86-32bit.tar.gz 11501665
BLAKE2B
e41dd65d940c0c91c67e6ec4c46ea2c3327e96d372c493635d05833862f2aa73919410a9e9a9c090a6fa65fd29e022a9b088c07a5e11089aee04b3b86005ad1e
SHA512
02fcf6ac88f6052206aa55b6fc2b37f499da26e596e8e64b1c20e87dc4a24f745416da56c6e1268feff60321f54cb45864b8d34e055ea2f99da37b6efeedc844
DIST mysql-connector-odbc-5.3.9-linux-debian9-x86-64bit.tar.gz 12013057
BLAKE2B
e372cfb6ca49f9f01e9e60d7cd497fc009ec38dee76ca2cfb74cc95213b84ef1eebca85e1400f19c9715c0f9b2ef40fc212196e14189f5506be8d0e887507ce4
SHA512
b54ca167f762b4d8b988b4a91f14dc6a4bf49f55bc639ce8eecc9eba6c11400bd3494d74ef77ebe3348bdefd8fb5b8c1b62b3a6beebb926a1899da17ea4a1b44
+DIST mysql-connector-odbc-8.0.16-src.tar.gz 3986610 BLAKE2B
c91760f8e0352a57adb5400700d22f52f70d5210d85ff0932f5288f19c917c771ce9ea9abad097d27a9723c585d1029d56c09f6865f634f9c41ad852690e016d
SHA512
b7ddcdf635441bc3ed0325a8562f453e42d3c9768b0fe0b42d9b5417e268f4631e3fca3c2adc417c124ede37254c7b1890c792593d846ecaf5b158ce4b4808cd
diff --git a/dev-db/myodbc/files/8.0-cmake-doc-path.patch
b/dev-db/myodbc/files/8.0-cmake-doc-path.patch
new file mode 100644
index 000..405c39e0bcd
--- /dev/null
+++ b/dev-db/myodbc/files/8.0-cmake-doc-path.patch
@@ -0,0 +1,42 @@
+diff -aurN a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2019-06-11 11:21:59.723705824 -0400
b/CMakeLists.txt 2019-06-11 11:26:11.109625713 -0400
+@@ -71,6 +71,12 @@
+
+ INCLUDE(version.cmake)
+
++IF(WITH_DOCUMENTATION_INSTALL_PATH)
++ set(DOCUMENTATION_INSTALL_PATH ${WITH_DOCUMENTATION_INSTALL_PATH})
++ELSE(WITH_DOCUMENTATION_INSTALL_PATH)
++ set(DOCUMENTATION_INSTALL_PATH
${CMAKE_INSTALL_PREFIX}/share/doc/myodbc-${CONNECTOR_MAJOR}.${CONNECTOR_MINOR})
++ENDIF(WITH_DOCUMENTATION_INSTALL_PATH)
++
+ IF(NOT WIN32)
+ INCLUDE(CheckFunctionExists)
+ CHECK_FUNCTION_EXISTS(dlopen DLOPEN_IN_LIBC)
+@@ -520,13 +526,10 @@
+ # Installation ---
+-INCLUDE(cmake/info_bin.cmake)
+
+-INSTALL(FILES LICENSE.txt DESTINATION .)
+-
+ if(EXISTS "${CMAKE_SOURCE_DIR}/README.txt")
+- INSTALL(FILES README.txtDESTINATION .)
++ INSTALL(FILES README.txtDESTINATION ${DOCUMENTATION_INSTALL_PATH})
+ else()
+- INSTALL(FILES README.mdDESTINATION .)
+- INSTALL(FILES CONTRIBUTING.mdDESTINATION .)
++ INSTALL(FILES README.mdDESTINATION ${DOCUMENTATION_INSTALL_PATH})
++ INSTALL(FILES CONTRIBUTING.mdDESTINATION ${DOCUMENTATION_INSTALL_PATH})
+ endif()
+
+ IF(WIN32)
+@@ -567,7 +571,7 @@
+
+ ELSE(WIN32)
+
+- INSTALL(FILES ChangeLogDESTINATION .)
++ INSTALL(FILES ChangeLogDESTINATION ${DOCUMENTATION_INSTALL_PATH})
+
+ ENDIF(WIN32)
+
diff --git a/dev-db/myodbc/files/8.0.16-cxxlinkage.patch
b/dev-db/myodbc/files/8.0.16-cxxlinkage.patch
new file mode 100644
index 000..326036c0b88
--- /dev/null
+++ b/dev-db/myodbc/files/8.0.16-cxxlinkage.patch
@@ -0,0 +1,63 @@
+diff -aurN a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
+--- a/cmake/FindMySQL.cmake2016-11-29 07:40:13.0 -0500
b/cmake/FindMySQL.cmake2017-02-17 13:59:18.115389096 -0500
+@@ -747,7 +747,7 @@
+ endif()
+
+ if(NOT MYSQL_CXXFLAGS)
+- if(MYSQL_CXX_LINKAGE OR MYSQL_VERSION_ID GREATER 50603)
++ if(MYSQL_CXX_LINKAGE)
+ _mysql_conf(MYSQL_CXXFLAGS "--cxxflags")
+ set(MYSQL_CXX_LINKAGE 1)
+ else()
+diff -aurN a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2018-02-10 21:41:13.161553751 -0500
b/CMakeLists.txt 2018-02-10 21:45:20.038398824 -0500
+@@ -379,10 +379,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
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/, profiles/, dev-db/myodbc/files/
commit: dec8372a0b3e7cff5081aa32e3ead407d16e1836
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Oct 16 12:47:46 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Oct 16 12:48:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dec8372a
dev-db/myodbc: Drop slot 5.2
Acked-by: Brian Evans gentoo.org>
Signed-off-by: Andreas Sturmlechner gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
dev-db/myodbc/Manifest | 1 -
.../myodbc/files/5.2.7-mariadb-dynamic-array.patch | 79 -
dev-db/myodbc/files/5.2.7-my_malloc.patch | 18 ---
dev-db/myodbc/files/5.2.7-r1-cxxlinkage.patch | 40 ---
dev-db/myodbc/myodbc-5.2.7-r1.ebuild | 117 --
dev-db/myodbc/myodbc-5.2.7-r3.ebuild | 131 -
profiles/package.mask | 5 -
7 files changed, 391 deletions(-)
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index c15882461b4..a3791a4441a 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -1,4 +1,3 @@
-DIST mysql-connector-odbc-5.2.7-src.tar.gz 606472 BLAKE2B
297f1ae57802f682616283bae9c3ff7ef88f8f016274884794f6b476bf9b92bc1da8af9cb89f41fa2a74238f91fbc39b9427529b806ac4ffb52aecd895cd8cd8
SHA512
f54ac8a23ade71da85e1335e95eccdccfd68a8687d17a584ced103812bdc5aee8014769a84eaa22724bb2cb23d34c7188c964d3283723defeaef5157a4b3c60f
DIST mysql-connector-odbc-5.3.10-src.tar.gz 2646571 BLAKE2B
e85e179ee8a54c8c98dd254e949c08227adc72141d52bc15935eafd60edaf95f47c12ca51fa9472ae29c761d5de2149277c58e6d3f02a58be17f595ca7ba
SHA512
ebe56b95a1690332959a7a37e8ed381b46730fb9f6fbd6522ddc1a6961e4c8cdac59681a957b33abeb6cae12f210278e4063daa59ce952d92acf427bc188e22b
DIST mysql-connector-odbc-5.3.9-linux-debian9-x86-32bit.tar.gz 11501665
BLAKE2B
e41dd65d940c0c91c67e6ec4c46ea2c3327e96d372c493635d05833862f2aa73919410a9e9a9c090a6fa65fd29e022a9b088c07a5e11089aee04b3b86005ad1e
SHA512
02fcf6ac88f6052206aa55b6fc2b37f499da26e596e8e64b1c20e87dc4a24f745416da56c6e1268feff60321f54cb45864b8d34e055ea2f99da37b6efeedc844
DIST mysql-connector-odbc-5.3.9-linux-debian9-x86-64bit.tar.gz 12013057
BLAKE2B
e372cfb6ca49f9f01e9e60d7cd497fc009ec38dee76ca2cfb74cc95213b84ef1eebca85e1400f19c9715c0f9b2ef40fc212196e14189f5506be8d0e887507ce4
SHA512
b54ca167f762b4d8b988b4a91f14dc6a4bf49f55bc639ce8eecc9eba6c11400bd3494d74ef77ebe3348bdefd8fb5b8c1b62b3a6beebb926a1899da17ea4a1b44
diff --git a/dev-db/myodbc/files/5.2.7-mariadb-dynamic-array.patch
b/dev-db/myodbc/files/5.2.7-mariadb-dynamic-array.patch
deleted file mode 100644
index 6cfe7cd274b..000
--- a/dev-db/myodbc/files/5.2.7-mariadb-dynamic-array.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -aurN a/driver/catalog_no_i_s.c b/driver/catalog_no_i_s.c
a/driver/catalog_no_i_s.c 2014-06-18 18:50:16.0 -0400
-+++ b/driver/catalog_no_i_s.c 2014-08-20 14:08:33.997339096 -0400
-@@ -1093,7 +1093,11 @@
- unsigned long *lengths;
- SQLRETURN rc= SQL_SUCCESS;
-
-+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 11
-+ my_init_dynamic_array(, sizeof(MY_FOREIGN_KEY_FIELD), 0, 0, MYF(0));
-+#else
- my_init_dynamic_array(, sizeof(MY_FOREIGN_KEY_FIELD), 0, 0);
-+#endif
-
- /* Get the list of tables that match szCatalog and szTable */
- pthread_mutex_lock(>dbc->lock);
-diff -aurN a/driver/desc.c b/driver/desc.c
a/driver/desc.c2014-06-18 18:50:16.0 -0400
-+++ b/driver/desc.c2014-08-20 14:07:37.409169269 -0400
-@@ -63,8 +63,12 @@
- but in desc_get_rec we manually get a pointer to it. This avoids
- having to call set_dynamic after modifying the DESCREC.
- */
-+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 11
-+ if (my_init_dynamic_array(>records, sizeof(DESCREC), 0, 0, MYF(0)))
-+#else
- if (my_init_dynamic_array(>records, sizeof(DESCREC), 0, 0))
-+#endif
- {
- x_free((char *)desc);
- return NULL;
- }
-@@ -995,9 +1003,15 @@
-
- /* copy the records */
- delete_dynamic(>records);
-+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 11
-+ if (my_init_dynamic_array(>records, sizeof(DESCREC),
-+src->records.max_element,
-+src->records.alloc_increment, MYF(0)))
-+#else
- if (my_init_dynamic_array(>records, sizeof(DESCREC),
- src->records.max_element,
- src->records.alloc_increment))
-+#endif
- {
- return set_desc_error(dest, "HY001",
- "Memory allocation error",
-diff -aurN a/driver/handle.c b/driver/handle.c
a/driver/handle.c 2014-06-18 18:50:16.0 -0400
-+++ b/driver/handle.c 2014-08-20 14:05:00.364248403 -0400
-@@ -403,7 +403,11 @@
- }
- }
-
-+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 11
-+ my_init_dynamic_array(*param_bind, sizeof(MYSQL_BIND), elements, 10,
MYF(0));
-+#else
-
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: 63454736994d3cd6314ef94e674981d21790c8c4
Author: Thomas Deutschmann gentoo org>
AuthorDate: Fri Aug 24 01:25:36 2018 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Fri Aug 24 01:25:36 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63454736
dev-db/myodbc: x86 stable (bug #649050)
Package-Manager: Portage-2.3.48, Repoman-2.3.10
dev-db/myodbc/myodbc-5.3.10-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-db/myodbc/myodbc-5.3.10-r2.ebuild
b/dev-db/myodbc/myodbc-5.3.10-r2.ebuild
index a9970370948..28dde7ddccb 100644
--- a/dev-db/myodbc/myodbc-5.3.10-r2.ebuild
+++ b/dev-db/myodbc/myodbc-5.3.10-r2.ebuild
@@ -18,7 +18,7 @@
SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar
LICENSE="GPL-2"
SLOT="${MAJOR}"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
IUSE=""
# Does not build with libmariadb
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: 1bd3f8b67ea3fb2e78f57ceac4debde253d96ca3
Author: Sergei Trofimovich gentoo org>
AuthorDate: Tue Aug 21 00:08:26 2018 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Tue Aug 21 00:08:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bd3f8b6
dev-db/myodbc: stable 5.3.10-r2 for ppc, bug #649050
Package-Manager: Portage-2.3.47, Repoman-2.3.10
RepoMan-Options: --include-arches="ppc"
dev-db/myodbc/myodbc-5.3.10-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-db/myodbc/myodbc-5.3.10-r2.ebuild
b/dev-db/myodbc/myodbc-5.3.10-r2.ebuild
index 8e94bfdd4b5..a9970370948 100644
--- a/dev-db/myodbc/myodbc-5.3.10-r2.ebuild
+++ b/dev-db/myodbc/myodbc-5.3.10-r2.ebuild
@@ -18,7 +18,7 @@
SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar
LICENSE="GPL-2"
SLOT="${MAJOR}"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc ~x86"
IUSE=""
# Does not build with libmariadb
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: eb1d71f4251065ded24c9d1456f1014234f9a58e
Author: Mikle Kolyada gentoo org>
AuthorDate: Sat Aug 18 23:13:48 2018 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sat Aug 18 23:13:48 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb1d71f4
dev-db/myodbc: amd64 stable wrt bug #649050
Package-Manager: Portage-2.3.40, Repoman-2.3.9
dev-db/myodbc/myodbc-5.3.10-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-db/myodbc/myodbc-5.3.10-r2.ebuild
b/dev-db/myodbc/myodbc-5.3.10-r2.ebuild
index 1172fce91be..8e94bfdd4b5 100644
--- a/dev-db/myodbc/myodbc-5.3.10-r2.ebuild
+++ b/dev-db/myodbc/myodbc-5.3.10-r2.ebuild
@@ -18,7 +18,7 @@
SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar
LICENSE="GPL-2"
SLOT="${MAJOR}"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE=""
# Does not build with libmariadb
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/files/
commit: aa03db5590275a9006689a518388d49f81a2c153
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Thu May 17 08:35:56 2018 +
Commit: Aaron Bauman gentoo org>
CommitDate: Fri May 18 12:34:06 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa03db55
dev-db/myodbc: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/8452
dev-db/myodbc/files/5.3-cxxlinkage.patch | 43 --
.../myodbc/files/5.3-mariadb-buffer_length.patch | 93 -
.../myodbc/files/5.3-mariadb-dynamic-array.patch | 96 --
3 files changed, 232 deletions(-)
diff --git a/dev-db/myodbc/files/5.3-cxxlinkage.patch
b/dev-db/myodbc/files/5.3-cxxlinkage.patch
deleted file mode 100644
index 319262c81ca..000
--- a/dev-db/myodbc/files/5.3-cxxlinkage.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -aurN a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
a/cmake/FindMySQL.cmake2016-11-29 07:40:13.0 -0500
-+++ b/cmake/FindMySQL.cmake2017-02-17 13:59:18.115389096 -0500
-@@ -747,7 +747,7 @@
- endif()
-
- if(NOT MYSQL_CXXFLAGS)
-- if(MYSQL_CXX_LINKAGE OR MYSQL_VERSION_ID GREATER 50603)
-+ if(MYSQL_CXX_LINKAGE)
- _mysql_conf(MYSQL_CXXFLAGS "--cxxflags")
- set(MYSQL_CXX_LINKAGE 1)
- else()
-diff -aurN a/CMakeLists.txt b/CMakeLists.txt
a/CMakeLists.txt 2017-02-17 13:50:43.556006202 -0500
-+++ b/CMakeLists.txt 2017-02-17 13:57:15.745676184 -0500
-@@ -242,10 +242,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 -aurN a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
a/cmake/FindMySQL.cmake2017-02-17 14:44:29.532733308 -0500
-+++ b/cmake/FindMySQL.cmake2017-02-17 14:48:56.756740330 -0500
-@@ -270,8 +270,8 @@
- set(_static_lib_ext ".lib") # Careful, can be import library for DLL
- elseif(MYSQLCLIENT_NO_THREADS)
- # In 5.1 and below there is a single threaded library
-- set(_dynamic_libs "mysqlclient")
-- set(_static_libs"libmysqlclient.a")
-+ set(_dynamic_libs "${MYSQLCLIENT_LIB_NAME}")
-+ set(_static_libs"lib${MYSQLCLIENT_LIB_NAME}.a")
- set(_static_lib_ext ".a")
- else()
- # We try the multithreaded "libmysqlclient_r" first and if not
diff --git a/dev-db/myodbc/files/5.3-mariadb-buffer_length.patch
b/dev-db/myodbc/files/5.3-mariadb-buffer_length.patch
deleted file mode 100644
index 1be9cc466b6..000
--- a/dev-db/myodbc/files/5.3-mariadb-buffer_length.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -aurN a/driver/connect.c b/driver/connect.c
a/driver/connect.c 2016-11-29 07:40:13.0 -0500
-+++ b/driver/connect.c 2017-02-17 16:14:48.116640371 -0500
-@@ -510,11 +510,11 @@
- }
- }
-
--#if MYSQL_VERSION_ID >= 50709
-- mysql_get_option(mysql, MYSQL_OPT_NET_BUFFER_LENGTH,
>net_buffer_length);
-+#if MYSQL_VERSION_ID >= 50709 && !defined(MARIADB_BASE_VERSION)
-+ mysql_get_option(mysql, MYSQL_OPT_NET_BUFFER_LENGTH,
>net_buffer_length_value);
- #else
- // for older versions just use net_buffer_length() macro
-- dbc->net_buffer_length = net_buffer_length;
-+ dbc->net_buffer_length_value = net_buffer_length;
- #endif
- return rc;
-
-diff -aurN a/driver/cursor.c b/driver/cursor.c
a/driver/cursor.c 2016-11-29 07:40:13.0 -0500
-+++ b/driver/cursor.c 2017-02-17 16:13:19.163299885 -0500
-@@ -1485,7 +1485,7 @@
- We have a limited capacity to shove data across the wire, but
- we handle this by sending in multiple calls to exec_stmt_query()
- */
--if (ext_query->length + length >= (SQLULEN)
stmt->dbc->net_buffer_length)
-+if (ext_query->length + length >= (SQLULEN)
stmt->dbc->net_buffer_length_value)
- {
- break_insert= TRUE;
- break;
-diff -aurN a/driver/driver.h b/driver/driver.h
a/driver/driver.h 2016-11-29 07:40:13.0 -0500
-+++ b/driver/driver.h 2017-02-17 16:10:57.072950723 -0500
-@@ -378,7 +378,7 @@
- int txn_isolation;
- uint port;
- uint cursor_count;
-- ulong net_buffer_length;
-+ ulong net_buffer_length_value;
- uint commit_flag;
- #ifdef THREAD
- myodbc_mutex_t lock;
-diff -aurN a/driver/info.c b/driver/info.c
a/driver/info.c2016-11-29 07:40:13.0 -0500
-+++ b/driver/info.c2017-02-17 16:12:54.315763441 -0500
-@@ -587,7 +587,7 @@
- MYINFO_SET_USHORT(0);
-
- case SQL_MAX_STATEMENT_LEN:
--MYINFO_SET_ULONG(dbc->net_buffer_length);
-+MYINFO_SET_ULONG(dbc->net_buffer_length_value);
-
- case
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: 4dc1cbeee8ae379e29d8db3ee376285a19b19ca3
Author: Brian Evans gentoo org>
AuthorDate: Thu May 17 14:37:30 2018 +
Commit: Brian Evans gentoo org>
CommitDate: Thu May 17 14:37:30 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dc1cbee
dev-db/myodbc: Change virtual/mysql to virtual/libmysqlclient
dev-db/myodbc/myodbc-5.2.7-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-db/myodbc/myodbc-5.2.7-r1.ebuild
b/dev-db/myodbc/myodbc-5.2.7-r1.ebuild
index 6f390d0e01e..2698ccabd5d 100644
--- a/dev-db/myodbc/myodbc-5.2.7-r1.ebuild
+++ b/dev-db/myodbc/myodbc-5.2.7-r1.ebuild
@@ -20,7 +20,7 @@ IUSE=""
RDEPEND="
dev-db/unixODBC[${MULTILIB_USEDEP}]
- >=virtual/mysql-5.5[${MULTILIB_USEDEP}]"
+ ~virtual/libmysqlclient-18[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}"
S=${WORKDIR}/${MY_P}
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: d3ecd1e5d0d45f9356367f294da2039449436738
Author: Brian Evans gentoo org>
AuthorDate: Tue Mar 27 12:50:38 2018 +
Commit: Brian Evans gentoo org>
CommitDate: Tue Mar 27 12:50:38 2018 +
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}"
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/, dev-db/myodbc/files/
commit: 1c3d12ccc75b97f990ba95de27d345566d6d5b08
Author: Brian Evans gentoo org>
AuthorDate: Thu Mar 1 17:51:53 2018 +
Commit: Brian Evans gentoo org>
CommitDate: Thu Mar 1 17:51:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c3d12cc
dev-db/myodbc: Fix build of 5.3.10 with mariadb 10.{0,1}
Package-Manager: Portage-2.3.24, Repoman-2.3.6
dev-db/myodbc/files/5.3.10-mariadb.patch | 58
dev-db/myodbc/myodbc-5.3.10-r1.ebuild| 2 +-
2 files changed, 59 insertions(+), 1 deletion(-)
diff --git a/dev-db/myodbc/files/5.3.10-mariadb.patch
b/dev-db/myodbc/files/5.3.10-mariadb.patch
new file mode 100644
index 000..c860349e4b7
--- /dev/null
+++ b/dev-db/myodbc/files/5.3.10-mariadb.patch
@@ -0,0 +1,58 @@
+--- a/include/sys_main.h 2018-01-19 05:36:38.0 -0500
b/include/sys_main.h 2018-03-01 11:40:04.554713079 -0500
+@@ -20,6 +20,8 @@
+ extern "C" {
+ #endif
+
++#include "sys/mysql/psi/psi_memory.h"
++
+ #define MY_FAE8 /* Fatal if any error */
+ #define MY_WME16 /* Write message on error */
+ #define MY_ZEROFILL 32 /* my_malloc(), fill array with zero */
+--- a/driver/connect.c 2018-01-19 05:36:38.0 -0500
b/driver/connect.c 2018-03-01 11:39:51.458676373 -0500
+@@ -179,7 +179,7 @@
+ /* Set other connection options */
+
+ if (ds->allow_big_results || ds->safe)
+-#if MYSQL_VERSION_ID >= 50709
++#if MYSQL_VERSION_ID >= 50709 && !defined(MARIADB_BASE_VERSION)
+ mysql_options(mysql, MYSQL_OPT_MAX_ALLOWED_PACKET, _long);
+ #else
+ /* max_allowed_packet is a magical mysql macro. */
+@@ -252,7 +252,7 @@
+ ds_get_utf8attr(ds->rsakey, >rsakey8));
+ }
+ #endif
+-#if MYSQL_VERSION_ID >= 50710
++#if MYSQL_VERSION_ID >= 50710 && !defined(MARIADB_BASE_VERSION)
+ {
+ char tls_options[128] = { 0 };
+ if (!ds->no_tls_1)
+@@ -323,7 +323,7 @@
+ #endif
+
+ mysql->options.use_ssl = !ds->disable_ssl_default;
+-#if MYSQL_VERSION_ID >= 50703
++#if MYSQL_VERSION_ID >= 50703 && !defined(MARIADB_BASE_VERSION)
+ {
+ if (ds->ssl_enforce)
+ {
+@@ -332,7 +332,7 @@
+ }
+ #endif
+
+-#if MYSQL_VERSION_ID >= 50711
++#if MYSQL_VERSION_ID >= 50711 && !defined(MARIADB_BASE_VERSION)
+ if (ds->sslmode)
+ {
+ unsigned int mode = 0;
+@@ -510,7 +510,7 @@
+ }
+ }
+
+-#if MYSQL_VERSION_ID >= 50709
++#if MYSQL_VERSION_ID >= 50709 && !defined(MARIADB_BASE_VERSION)
+ mysql_get_option(mysql, MYSQL_OPT_NET_BUFFER_LENGTH, >net_buffer_len);
+ #else
+ // for older versions just use net_buffer_length() macro
diff --git a/dev-db/myodbc/myodbc-5.3.10-r1.ebuild
b/dev-db/myodbc/myodbc-5.3.10-r1.ebuild
index 63881efa73e..5aeb327fb5b 100644
--- a/dev-db/myodbc/myodbc-5.3.10-r1.ebuild
+++ b/dev-db/myodbc/myodbc-5.3.10-r1.ebuild
@@ -43,7 +43,7 @@ PATCHES=(
"${FILESDIR}/5.3.10-cxxlinkage.patch"
# "${FILESDIR}/${MAJOR}-mariadb-dynamic-array.patch"
"${FILESDIR}/5.2.7-my_malloc.patch"
-# "${FILESDIR}/${MAJOR}-mariadb-buffer_length.patch"
+ "${FILESDIR}/5.3.10-mariadb.patch"
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: c1208f74321fb98369588e328ec27952f6518c09
Author: Brian Evans gentoo org>
AuthorDate: Thu Mar 1 16:01:17 2018 +
Commit: Brian Evans gentoo org>
CommitDate: Thu Mar 1 16:01:17 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1208f74
dev-db/myodbc: Fix dependencies that do not work with 5.3.10
Closes: https://bugs.gentoo.org/649188
Package-Manager: Portage-2.3.24, Repoman-2.3.6
dev-db/myodbc/{myodbc-5.3.10.ebuild => myodbc-5.3.10-r1.ebuild} | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/dev-db/myodbc/myodbc-5.3.10.ebuild
b/dev-db/myodbc/myodbc-5.3.10-r1.ebuild
similarity index 97%
rename from dev-db/myodbc/myodbc-5.3.10.ebuild
rename to dev-db/myodbc/myodbc-5.3.10-r1.ebuild
index 9fd6b225fc6..63881efa73e 100644
--- a/dev-db/myodbc/myodbc-5.3.10.ebuild
+++ b/dev-db/myodbc/myodbc-5.3.10-r1.ebuild
@@ -21,13 +21,15 @@ SLOT="${MAJOR}"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE=""
-# Does not build with mysql-connector-c
+# Does not build with libmariadb
RDEPEND="
dev-db/unixODBC[${MULTILIB_USEDEP}]
~virtual/libmysqlclient-18[${MULTILIB_USEDEP}]
abi_x86_32? (
!app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
)
+ !>=dev-db/mariadb-10.2.0[client-libs(+)]
+ !dev-db/mariadb-connector-c[mysqlcompat(-)]
"
DEPEND="${RDEPEND}"
S=${WORKDIR}/${MY_P}
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/, dev-db/myodbc/files/
commit: fb94ebc448db596b58715e5b081e30a73dceec3d
Author: Brian Evans gentoo org>
AuthorDate: Wed Feb 28 23:12:43 2018 +
Commit: Brian Evans gentoo org>
CommitDate: Wed Feb 28 23:12:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb94ebc4
dev-db/myodbc: Version bump for 5.3.10; fix building 5.2.7-r3
Package-Manager: Portage-2.3.24, Repoman-2.3.6
dev-db/myodbc/Manifest | 1 +
dev-db/myodbc/files/5.3.10-cxxlinkage.patch| 29 ++
dev-db/myodbc/myodbc-5.2.7-r3.ebuild | 1 +
...myodbc-5.2.7-r3.ebuild => myodbc-5.3.10.ebuild} | 62 +-
4 files changed, 68 insertions(+), 25 deletions(-)
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index ffc0ab6232d..c15882461b4 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -1,3 +1,4 @@
DIST mysql-connector-odbc-5.2.7-src.tar.gz 606472 BLAKE2B
297f1ae57802f682616283bae9c3ff7ef88f8f016274884794f6b476bf9b92bc1da8af9cb89f41fa2a74238f91fbc39b9427529b806ac4ffb52aecd895cd8cd8
SHA512
f54ac8a23ade71da85e1335e95eccdccfd68a8687d17a584ced103812bdc5aee8014769a84eaa22724bb2cb23d34c7188c964d3283723defeaef5157a4b3c60f
+DIST mysql-connector-odbc-5.3.10-src.tar.gz 2646571 BLAKE2B
e85e179ee8a54c8c98dd254e949c08227adc72141d52bc15935eafd60edaf95f47c12ca51fa9472ae29c761d5de2149277c58e6d3f02a58be17f595ca7ba
SHA512
ebe56b95a1690332959a7a37e8ed381b46730fb9f6fbd6522ddc1a6961e4c8cdac59681a957b33abeb6cae12f210278e4063daa59ce952d92acf427bc188e22b
DIST mysql-connector-odbc-5.3.9-linux-debian9-x86-32bit.tar.gz 11501665
BLAKE2B
e41dd65d940c0c91c67e6ec4c46ea2c3327e96d372c493635d05833862f2aa73919410a9e9a9c090a6fa65fd29e022a9b088c07a5e11089aee04b3b86005ad1e
SHA512
02fcf6ac88f6052206aa55b6fc2b37f499da26e596e8e64b1c20e87dc4a24f745416da56c6e1268feff60321f54cb45864b8d34e055ea2f99da37b6efeedc844
DIST mysql-connector-odbc-5.3.9-linux-debian9-x86-64bit.tar.gz 12013057
BLAKE2B
e372cfb6ca49f9f01e9e60d7cd497fc009ec38dee76ca2cfb74cc95213b84ef1eebca85e1400f19c9715c0f9b2ef40fc212196e14189f5506be8d0e887507ce4
SHA512
b54ca167f762b4d8b988b4a91f14dc6a4bf49f55bc639ce8eecc9eba6c11400bd3494d74ef77ebe3348bdefd8fb5b8c1b62b3a6beebb926a1899da17ea4a1b44
diff --git a/dev-db/myodbc/files/5.3.10-cxxlinkage.patch
b/dev-db/myodbc/files/5.3.10-cxxlinkage.patch
new file mode 100644
index 000..796a13754f8
--- /dev/null
+++ b/dev-db/myodbc/files/5.3.10-cxxlinkage.patch
@@ -0,0 +1,29 @@
+diff -aurN a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
+--- a/cmake/FindMySQL.cmake2016-11-29 07:40:13.0 -0500
b/cmake/FindMySQL.cmake2017-02-17 13:59:18.115389096 -0500
+@@ -747,7 +747,7 @@
+ endif()
+
+ if(NOT MYSQL_CXXFLAGS)
+- if(MYSQL_CXX_LINKAGE OR MYSQL_VERSION_ID GREATER 50603)
++ if(MYSQL_CXX_LINKAGE)
+ _mysql_conf(MYSQL_CXXFLAGS "--cxxflags")
+ set(MYSQL_CXX_LINKAGE 1)
+ else()
+diff -aurN a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2018-02-10 21:41:13.161553751 -0500
b/CMakeLists.txt 2018-02-10 21:45:20.038398824 -0500
+@@ -379,10 +379,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.2.7-r3.ebuild
b/dev-db/myodbc/myodbc-5.2.7-r3.ebuild
index 2aa325486f3..5f7d1930d02 100644
--- a/dev-db/myodbc/myodbc-5.2.7-r3.ebuild
+++ b/dev-db/myodbc/myodbc-5.2.7-r3.ebuild
@@ -69,6 +69,7 @@ multilib_src_configure() {
-DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF}
-DMYSQL_LIB_DIR="${ROOT}/usr/$(get_libdir)"
-DLIB_SUBDIR="$(get_libdir)"
+ -DNO_THREADS=ON
)
cmake-utils_src_configure
}
diff --git a/dev-db/myodbc/myodbc-5.2.7-r3.ebuild
b/dev-db/myodbc/myodbc-5.3.10.ebuild
similarity index 68%
copy from dev-db/myodbc/myodbc-5.2.7-r3.ebuild
copy to dev-db/myodbc/myodbc-5.3.10.ebuild
index 2aa325486f3..9fd6b225fc6 100644
--- a/dev-db/myodbc/myodbc-5.2.7-r3.ebuild
+++ b/dev-db/myodbc/myodbc-5.3.10.ebuild
@@ -2,6 +2,10 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
+
+# Build is broken with ninja
+CMAKE_MAKEFILE_GENERATOR=emake
+
inherit cmake-multilib flag-o-matic versionator
MAJOR="$(get_version_component_range 1-2 $PV)"
@@ -10,12 +14,11 @@ 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"
+SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz;
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/, profiles/base/
commit: 034fc6d3a7378120b832f08b37c2bdbb3cefda87
Author: Brian Evans gentoo org>
AuthorDate: Wed Feb 28 17:55:39 2018 +
Commit: Brian Evans gentoo org>
CommitDate: Wed Feb 28 17:56:38 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=034fc6d3
base/package.use.mask: Restrict versions on client-libs USE mask
This keeps strange dependency changes until the other packages are ready
dev-db/myodbc/myodbc-5.2.7-r3.ebuild | 2 +-
profiles/base/package.use.mask | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-db/myodbc/myodbc-5.2.7-r3.ebuild
b/dev-db/myodbc/myodbc-5.2.7-r3.ebuild
index 326e8d0289e..2aa325486f3 100644
--- a/dev-db/myodbc/myodbc-5.2.7-r3.ebuild
+++ b/dev-db/myodbc/myodbc-5.2.7-r3.ebuild
@@ -15,7 +15,7 @@ RESTRICT="primaryuri"
LICENSE="GPL-2"
SLOT="${MAJOR}"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE=""
# Does not build with mysql-connector-c
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index d86ded7e426..cda85bd9878 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -9,9 +9,9 @@
# Brian Evans (28 Feb 2018)
# Mask client-libs USE to force users to install alternative standard pacakges
->=dev-db/mariadb-10.2 client-libs
-dev-db/mysql client-libs
-dev-db/percona-server client-libs
+>=dev-db/mariadb-10.3 client-libs
+>=dev-db/mysql-5.7 client-libs
+>=dev-db/percona-server-5.7 client-libs
# Andreas Sturmlechner (25 Feb 2018)
# Depends on obsolete media-libs/phonon[qt4]
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: ddfd60ff23edfe49550967315ea83f7f071ecb5c
Author: Brian Evans gentoo org>
AuthorDate: Thu Jan 18 17:36:33 2018 +
Commit: Brian Evans gentoo org>
CommitDate: Thu Jan 18 17:36:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddfd60ff
dev-db/myodbc: Drop old
Package-Manager: Portage-2.3.19, Repoman-2.3.6
dev-db/myodbc/Manifest | 3 -
dev-db/myodbc/myodbc-5.2.7-r2.ebuild | 124 ---
dev-db/myodbc/myodbc-5.3.8-r1.ebuild | 115 -
dev-db/myodbc/myodbc-5.3.8.ebuild| 137 ---
4 files changed, 379 deletions(-)
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index f327734ae34..ffc0ab6232d 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -1,6 +1,3 @@
DIST mysql-connector-odbc-5.2.7-src.tar.gz 606472 BLAKE2B
297f1ae57802f682616283bae9c3ff7ef88f8f016274884794f6b476bf9b92bc1da8af9cb89f41fa2a74238f91fbc39b9427529b806ac4ffb52aecd895cd8cd8
SHA512
f54ac8a23ade71da85e1335e95eccdccfd68a8687d17a584ced103812bdc5aee8014769a84eaa22724bb2cb23d34c7188c964d3283723defeaef5157a4b3c60f
-DIST mysql-connector-odbc-5.3.8-linux-debian8-x86-32bit.tar.gz 11295329
BLAKE2B
1d8b40fab8bb62ce94588ca1cdc4a93fe628ae8aa20b304c0a3b905b3139b754fb7d132e7ed82b49d87ba4eb1796027403fcc56319f8a07e39610014b9d6e2f0
SHA512
5d13d8545f3868eeaceb6e5d8b0f1a3ba8e5ce916ffa6d94467f0b5a0c057129d09fedb0084b25fe36da250aaf8bb21ba991696c1ed0def338792c2e4b592b56
-DIST mysql-connector-odbc-5.3.8-linux-debian8-x86-64bit.tar.gz 11782557
BLAKE2B
a44914bbd782898ce240c519f80730bbe1d6a0aafb82a0e359d3dcd7934d4c7680c4f44b3d66510fe54c66d24d966972bceac2aa86096973e417a209af04e321
SHA512
c28c1851a6ca560db78f96610b631edeeefb0006032eb17e3bd55da955abbbdfcf72d4a9b305a21151bb08a28b141ac89b3688cf778bfbc91393bfabb5e63783
-DIST mysql-connector-odbc-5.3.8-src.tar.gz 690403 BLAKE2B
7d6f66456bef9696840f3cb7811c9560bfed7df17fd3057450ca53ff4e93c2bb5d023361a85d025b18a06031eeafa413e710ec65397ecad4aa86c4e14f81441f
SHA512
4703deab548f2953a58421b20977ced8dfd197d5274f89dd9e080cebdf35da007e558d5d52b6b09109744eddc2905c834f1e3e2ac83df4249d069d5e14fd34ee
DIST mysql-connector-odbc-5.3.9-linux-debian9-x86-32bit.tar.gz 11501665
BLAKE2B
e41dd65d940c0c91c67e6ec4c46ea2c3327e96d372c493635d05833862f2aa73919410a9e9a9c090a6fa65fd29e022a9b088c07a5e11089aee04b3b86005ad1e
SHA512
02fcf6ac88f6052206aa55b6fc2b37f499da26e596e8e64b1c20e87dc4a24f745416da56c6e1268feff60321f54cb45864b8d34e055ea2f99da37b6efeedc844
DIST mysql-connector-odbc-5.3.9-linux-debian9-x86-64bit.tar.gz 12013057
BLAKE2B
e372cfb6ca49f9f01e9e60d7cd497fc009ec38dee76ca2cfb74cc95213b84ef1eebca85e1400f19c9715c0f9b2ef40fc212196e14189f5506be8d0e887507ce4
SHA512
b54ca167f762b4d8b988b4a91f14dc6a4bf49f55bc639ce8eecc9eba6c11400bd3494d74ef77ebe3348bdefd8fb5b8c1b62b3a6beebb926a1899da17ea4a1b44
diff --git a/dev-db/myodbc/myodbc-5.2.7-r2.ebuild
b/dev-db/myodbc/myodbc-5.2.7-r2.ebuild
deleted file mode 100644
index e475faca21e..000
--- a/dev-db/myodbc/myodbc-5.2.7-r2.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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=""
-
-# Does not build with mysql-connector-c
-RDEPEND="
- dev-db/unixODBC[${MULTILIB_USEDEP}]
- ~virtual/libmysqlclient-18[${MULTILIB_USEDEP}]
- abi_x86_32? (
- !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
- )
- !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}-r1-cxxlinkage.patch" \
- "${FILESDIR}/${PV}-mariadb-dynamic-array.patch" \
- "${FILESDIR}/${PV}-my_malloc.patch"
-
- # Fix undefined references due to standards change
- append-cflags -std=gnu89
-}
-
-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
- mycmakeargs+=(
- -DMYSQL_CXX_LINKAGE=0
-
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: 62037b85839498c15c79d2ae603749fd7af6a3ce
Author: Brian Evans gentoo org>
AuthorDate: Thu Jan 18 17:38:04 2018 +
Commit: Brian Evans gentoo org>
CommitDate: Thu Jan 18 17:38:04 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62037b85
dev-db/myodbc: Remove reference to deprcated libmysqlclient_r
Closes: https://bugs.gentoo.org/631982
Package-Manager: Portage-2.3.19, Repoman-2.3.6
dev-db/myodbc/myodbc-5.2.7-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-db/myodbc/myodbc-5.2.7-r1.ebuild
b/dev-db/myodbc/myodbc-5.2.7-r1.ebuild
index 22819c507ce..1e2fd5944d0 100644
--- a/dev-db/myodbc/myodbc-5.2.7-r1.ebuild
+++ b/dev-db/myodbc/myodbc-5.2.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -54,7 +54,7 @@ multilib_src_configure() {
mycmakeargs+=(
-DMYSQL_CXX_LINKAGE=0
-DWITH_UNIXODBC=1
- -DMYSQLCLIENT_LIB_NAME="libmysqlclient_r.so"
+ -DMYSQLCLIENT_LIB_NAME="libmysqlclient.so"
-DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF}
-DMYSQL_LIB_DIR="${ROOT}/usr/$(get_libdir)"
-DLIB_SUBDIR="$(get_libdir)"
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: dd43ce7255418e999ec2247a8cb642d6a4b8dcae
Author: Brian Evans gentoo org>
AuthorDate: Thu Jan 18 14:30:51 2018 +
Commit: Brian Evans gentoo org>
CommitDate: Thu Jan 18 14:30:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd43ce72
dev-db/myodbc: Version bump for 5.3.9 and revbump 5.2.7
Closes: https://bugs.gentoo.org/609420
Closes: https://bugs.gentoo.org/638228
Package-Manager: Portage-2.3.19, Repoman-2.3.6
dev-db/myodbc/Manifest | 2 +
dev-db/myodbc/myodbc-5.2.7-r3.ebuild | 133 +++
dev-db/myodbc/myodbc-5.3.9.ebuild| 116 ++
3 files changed, 251 insertions(+)
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index 8784ba9f34c..f327734ae34 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -2,3 +2,5 @@ DIST mysql-connector-odbc-5.2.7-src.tar.gz 606472 BLAKE2B
297f1ae57802f682616283
DIST mysql-connector-odbc-5.3.8-linux-debian8-x86-32bit.tar.gz 11295329
BLAKE2B
1d8b40fab8bb62ce94588ca1cdc4a93fe628ae8aa20b304c0a3b905b3139b754fb7d132e7ed82b49d87ba4eb1796027403fcc56319f8a07e39610014b9d6e2f0
SHA512
5d13d8545f3868eeaceb6e5d8b0f1a3ba8e5ce916ffa6d94467f0b5a0c057129d09fedb0084b25fe36da250aaf8bb21ba991696c1ed0def338792c2e4b592b56
DIST mysql-connector-odbc-5.3.8-linux-debian8-x86-64bit.tar.gz 11782557
BLAKE2B
a44914bbd782898ce240c519f80730bbe1d6a0aafb82a0e359d3dcd7934d4c7680c4f44b3d66510fe54c66d24d966972bceac2aa86096973e417a209af04e321
SHA512
c28c1851a6ca560db78f96610b631edeeefb0006032eb17e3bd55da955abbbdfcf72d4a9b305a21151bb08a28b141ac89b3688cf778bfbc91393bfabb5e63783
DIST mysql-connector-odbc-5.3.8-src.tar.gz 690403 BLAKE2B
7d6f66456bef9696840f3cb7811c9560bfed7df17fd3057450ca53ff4e93c2bb5d023361a85d025b18a06031eeafa413e710ec65397ecad4aa86c4e14f81441f
SHA512
4703deab548f2953a58421b20977ced8dfd197d5274f89dd9e080cebdf35da007e558d5d52b6b09109744eddc2905c834f1e3e2ac83df4249d069d5e14fd34ee
+DIST mysql-connector-odbc-5.3.9-linux-debian9-x86-32bit.tar.gz 11501665
BLAKE2B
e41dd65d940c0c91c67e6ec4c46ea2c3327e96d372c493635d05833862f2aa73919410a9e9a9c090a6fa65fd29e022a9b088c07a5e11089aee04b3b86005ad1e
SHA512
02fcf6ac88f6052206aa55b6fc2b37f499da26e596e8e64b1c20e87dc4a24f745416da56c6e1268feff60321f54cb45864b8d34e055ea2f99da37b6efeedc844
+DIST mysql-connector-odbc-5.3.9-linux-debian9-x86-64bit.tar.gz 12013057
BLAKE2B
e372cfb6ca49f9f01e9e60d7cd497fc009ec38dee76ca2cfb74cc95213b84ef1eebca85e1400f19c9715c0f9b2ef40fc212196e14189f5506be8d0e887507ce4
SHA512
b54ca167f762b4d8b988b4a91f14dc6a4bf49f55bc639ce8eecc9eba6c11400bd3494d74ef77ebe3348bdefd8fb5b8c1b62b3a6beebb926a1899da17ea4a1b44
diff --git a/dev-db/myodbc/myodbc-5.2.7-r3.ebuild
b/dev-db/myodbc/myodbc-5.2.7-r3.ebuild
new file mode 100644
index 000..326e8d0289e
--- /dev/null
+++ b/dev-db/myodbc/myodbc-5.2.7-r3.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-multilib 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=""
+
+# Does not build with mysql-connector-c
+RDEPEND="
+ dev-db/unixODBC[${MULTILIB_USEDEP}]
+ ~virtual/libmysqlclient-18[${MULTILIB_USEDEP}]
+ abi_x86_32? (
+ !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
+ )
+ !dev-db/mysql-connector-c
+ !>=dev-db/mariadb-10.2.0
+"
+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
+ local FILES=( "${FILESDIR}/cmake-doc-path.patch"
+ "${FILESDIR}/${PV}-r1-cxxlinkage.patch"
+ "${FILESDIR}/${PV}-mariadb-dynamic-array.patch"
+ "${FILESDIR}/${PV}-my_malloc.patch" )
+
+ # Fix undefined references due to standards change
+ append-cflags -std=gnu89
+
+ MYSQL_SERVER_INCLUDE=$(mysql_config --include | cut -d ' ' -f 1)
+ append-cflags "${MYSQL_SERVER_INCLUDE}/server"
+
+ append-cppflags -DSTACK_DIRECTION=1
+
+ cmake-utils_src_prepare
+}
+
+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
+ mycmakeargs+=(
+
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: 67988f7a829f49c62543ac520875526913fbbcf7
Author: Brian Evans gentoo org>
AuthorDate: Tue Jun 13 14:59:47 2017 +
Commit: Brian Evans gentoo org>
CommitDate: Tue Jun 13 14:59:47 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67988f7a
dev-db/myodbc: Add binary based ebuild from upstream
Rationale: This package depends on non-public API calls to libmysqlclient.
It requires a lot of time and effort to keep patching this to not use those
calls
or the library providers which vary from implementation to implementation.
Instead, use the upstream provided files for this rarely used package.
Most systems use their native library calls instead of ODBC these days.
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-db/myodbc/Manifest | 2 +
dev-db/myodbc/myodbc-5.3.8-r1.ebuild | 115 +++
2 files changed, 117 insertions(+)
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index 86f8f8e52f3..dfdb3445199 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -1,2 +1,4 @@
DIST mysql-connector-odbc-5.2.7-src.tar.gz 606472 SHA256
0ad8fcccb4c41c7100fe02ec0aa87938d33329d23f7b68d1b9031c87750392c9 SHA512
f54ac8a23ade71da85e1335e95eccdccfd68a8687d17a584ced103812bdc5aee8014769a84eaa22724bb2cb23d34c7188c964d3283723defeaef5157a4b3c60f
WHIRLPOOL
928808ac5b623ec345c8c1b8495ca1de7f10e65f0d14720e9bee6ab154ccf818ca690745a57fa7fa1c008ba57b24705657398cd9146fbf2e385c178deca0e499
+DIST mysql-connector-odbc-5.3.8-linux-debian8-x86-32bit.tar.gz 11295329 SHA256
67b7648f896c059aa7686b6384eadaddfe7043160b6f23edf3f78499e02cff45 SHA512
5d13d8545f3868eeaceb6e5d8b0f1a3ba8e5ce916ffa6d94467f0b5a0c057129d09fedb0084b25fe36da250aaf8bb21ba991696c1ed0def338792c2e4b592b56
WHIRLPOOL
00fd263c7eec68108b0f53c726a656f66a77627798c13ec9ec15aa3b6e4c51f8ef3562f7fbc3872b33320262b913fe646adc0013e8f8ba9c0dd931bc8f46b94f
+DIST mysql-connector-odbc-5.3.8-linux-debian8-x86-64bit.tar.gz 11782557 SHA256
e224456af3af1121e655c04cf809aad97471fcf2ff0082a21ed7b3ac69437776 SHA512
c28c1851a6ca560db78f96610b631edeeefb0006032eb17e3bd55da955abbbdfcf72d4a9b305a21151bb08a28b141ac89b3688cf778bfbc91393bfabb5e63783
WHIRLPOOL
4b9fd8169c77323247f61c6d2f3c843d5f8b3f5b89f9b134a3eec2d2a24c1b8a6a5b1d54241e6f3a6a05636d7701be5fac9a8f4b559555e7b12d65c4eda3172c
DIST mysql-connector-odbc-5.3.8-src.tar.gz 690403 SHA256
eca40e1ad359cd1d7e23b6692e60179c8e3daa66337e7a0232de4162664d9885 SHA512
4703deab548f2953a58421b20977ced8dfd197d5274f89dd9e080cebdf35da007e558d5d52b6b09109744eddc2905c834f1e3e2ac83df4249d069d5e14fd34ee
WHIRLPOOL
9286058a7d57e13e9a2e683682d87e0226e0e451880a20579867b673144d69f7941fbe16706267ca2caa058b1aef15fb4516445af8ab164fb745cd81a0c2814f
diff --git a/dev-db/myodbc/myodbc-5.3.8-r1.ebuild
b/dev-db/myodbc/myodbc-5.3.8-r1.ebuild
new file mode 100644
index 000..8dafc3edf90
--- /dev/null
+++ b/dev-db/myodbc/myodbc-5.3.8-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+inherit multilib-minimal versionator
+
+MAJOR="$(get_version_component_range 1-2 $PV)"
+MY_PN="mysql-connector-odbc"
+MY_P="${MY_PN}-${PV/_p/r}-linux-debian8-x86"
+
+DESCRIPTION="ODBC driver for MySQL"
+HOMEPAGE="http://www.mysql.com/products/myodbc/;
+BASE_URI="https://cdn.mysql.com/Downloads/Connector-ODBC/${MAJOR}/${MY_P};
+#https://cdn.mysql.com//Downloads/Connector-ODBC/5.3/mysql-connector-odbc-5.3.8-linux-debian8-x86-64bit.tar.gz
+SRC_URI="amd64? ( ${BASE_URI}-64bit.tar.gz abi_x86_32? (
${BASE_URI}-32bit.tar.gz ) )
+ x86? ( ${BASE_URI}-32bit.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="${MAJOR}"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-db/unixODBC[${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+ abi_x86_32? (
+ !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
+ )
+"
+S=${WORKDIR}
+
+#src_configure(){ :; }
+
+src_compile(){ :; }
+
+multilib_src_install() {
+ cd "${S}" || die
+ local prefix
+ if use amd64 && multilib_is_native_abi ; then
+ prefix="${MY_P}-64bit"
+ else
+ prefix="${MY_P}-32bit"
+ fi
+ exeinto /usr/$(get_libdir)/${PN}-${MAJOR}
+ doexe ${prefix}/lib/libmyodbc5a.so ${prefix}/lib/libmyodbc5w.so
+# use gtk && doexe ${prefix}/lib/libmyodbc5S.so
+}
+
+multilib_src_install_all() {
+ local DRIVER_NAME="${PN}-${SLOT}"
+ local prefix
+ if use amd64 ; then
+ prefix="${MY_P}-64bit"
+ else
+ prefix="${MY_P}-32bit"
+ fi
+ exeinto /usr/bin
+ newexe "${prefix}/bin/myodbc-installer" myodbc-installer-${MAJOR}
+
+ dodir /usr/share/${PN}-${SLOT}
+ for i in odbc.ini odbcinst.ini; do
+ einfo "Building $i"
+ sed \
+ -e "s,__PN__,${DRIVER_NAME},g" \
+
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/files/, dev-db/myodbc/
commit: b9d30cc5bfb8342a3606628289e5ca6b24542f36
Author: Brian Evans gentoo org>
AuthorDate: Fri Jun 9 18:58:51 2017 +
Commit: Brian Evans gentoo org>
CommitDate: Fri Jun 9 18:58:51 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9d30cc5
dev-db/myodbc: Version bump for testing
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-db/myodbc/Manifest | 1 +
dev-db/myodbc/files/5.3-cmake-doc-path.patch | 43 +++
dev-db/myodbc/files/5.3-cxxlinkage.patch | 43 +++
.../myodbc/files/5.3-mariadb-buffer_length.patch | 93 ++
.../myodbc/files/5.3-mariadb-dynamic-array.patch | 96 +++
dev-db/myodbc/myodbc-5.3.8.ebuild | 137 +
6 files changed, 413 insertions(+)
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index 42f54f28a41..86f8f8e52f3 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -1 +1,2 @@
DIST mysql-connector-odbc-5.2.7-src.tar.gz 606472 SHA256
0ad8fcccb4c41c7100fe02ec0aa87938d33329d23f7b68d1b9031c87750392c9 SHA512
f54ac8a23ade71da85e1335e95eccdccfd68a8687d17a584ced103812bdc5aee8014769a84eaa22724bb2cb23d34c7188c964d3283723defeaef5157a4b3c60f
WHIRLPOOL
928808ac5b623ec345c8c1b8495ca1de7f10e65f0d14720e9bee6ab154ccf818ca690745a57fa7fa1c008ba57b24705657398cd9146fbf2e385c178deca0e499
+DIST mysql-connector-odbc-5.3.8-src.tar.gz 690403 SHA256
eca40e1ad359cd1d7e23b6692e60179c8e3daa66337e7a0232de4162664d9885 SHA512
4703deab548f2953a58421b20977ced8dfd197d5274f89dd9e080cebdf35da007e558d5d52b6b09109744eddc2905c834f1e3e2ac83df4249d069d5e14fd34ee
WHIRLPOOL
9286058a7d57e13e9a2e683682d87e0226e0e451880a20579867b673144d69f7941fbe16706267ca2caa058b1aef15fb4516445af8ab164fb745cd81a0c2814f
diff --git a/dev-db/myodbc/files/5.3-cmake-doc-path.patch
b/dev-db/myodbc/files/5.3-cmake-doc-path.patch
new file mode 100644
index 000..54f35d41d96
--- /dev/null
+++ b/dev-db/myodbc/files/5.3-cmake-doc-path.patch
@@ -0,0 +1,43 @@
+=== modified file 'CMakeLists.txt'
+--- a/CMakeLists.txt 2013-03-09 09:51:06 +
b/CMakeLists.txt 2013-03-09 11:05:27 +
+@@ -33,6 +33,12 @@
+
+ INCLUDE(version.cmake)
+
++IF(WITH_DOCUMENTATION_INSTALL_PATH)
++ set(DOCUMENTATION_INSTALL_PATH ${WITH_DOCUMENTATION_INSTALL_PATH})
++ELSE(WITH_DOCUMENTATION_INSTALL_PATH)
++ set(DOCUMENTATION_INSTALL_PATH
${CMAKE_INSTALL_PREFIX}/share/doc/myodbc-${CONNECTOR_MAJOR}.${CONNECTOR_MINOR})
++ENDIF(WITH_DOCUMENTATION_INSTALL_PATH)
++
+ #Default is to build both drivers
+ IF(UNICODE OR NOT ANSI)
+ MESSAGE(STATUS "Configuring to build Unicode driver")
+@@ -329,19 +335,17 @@
+
+ ELSE(WIN32)
+
+- INSTALL(FILES ChangeLogDESTINATION .)
+- INSTALL(FILES README DESTINATION .)
+- INSTALL(FILES README.debug DESTINATION .)
+- INSTALL(FILES INSTALL DESTINATION .)
++INSTALL(FILES ChangeLogDESTINATION ${DOCUMENTATION_INSTALL_PATH})
++INSTALL(FILES README DESTINATION ${DOCUMENTATION_INSTALL_PATH})
++INSTALL(FILES README.debug DESTINATION ${DOCUMENTATION_INSTALL_PATH})
++INSTALL(FILES INSTALL DESTINATION ${DOCUMENTATION_INSTALL_PATH})
+ IF(EXISTS "${CMAKE_SOURCE_DIR}/COPYING")
+-INSTALL(FILES COPYING DESTINATION .)
+ ELSE()
+-INSTALL(FILES LICENSE.mysql DESTINATION .)
+ ENDIF()
+
+ ENDIF(WIN32)
+
+-INSTALL(FILES Licenses_for_Third-Party_Components.txt DESTINATION .)
++INSTALL(FILES Licenses_for_Third-Party_Components.txt DESTINATION
${DOCUMENTATION_INSTALL_PATH})
+
+ INCLUDE(CPack)
+
+
+
diff --git a/dev-db/myodbc/files/5.3-cxxlinkage.patch
b/dev-db/myodbc/files/5.3-cxxlinkage.patch
new file mode 100644
index 000..319262c81ca
--- /dev/null
+++ b/dev-db/myodbc/files/5.3-cxxlinkage.patch
@@ -0,0 +1,43 @@
+diff -aurN a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
+--- a/cmake/FindMySQL.cmake2016-11-29 07:40:13.0 -0500
b/cmake/FindMySQL.cmake2017-02-17 13:59:18.115389096 -0500
+@@ -747,7 +747,7 @@
+ endif()
+
+ if(NOT MYSQL_CXXFLAGS)
+- if(MYSQL_CXX_LINKAGE OR MYSQL_VERSION_ID GREATER 50603)
++ if(MYSQL_CXX_LINKAGE)
+ _mysql_conf(MYSQL_CXXFLAGS "--cxxflags")
+ set(MYSQL_CXX_LINKAGE 1)
+ else()
+diff -aurN a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2017-02-17 13:50:43.556006202 -0500
b/CMakeLists.txt 2017-02-17 13:57:15.745676184 -0500
+@@ -242,10 +242,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 -aurN a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
+--- a/cmake/FindMySQL.cmake2017-02-17
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/
commit: 472703f53f4a530931c923e3e04c9d5f681518ee
Author: Brian Evans gentoo org>
AuthorDate: Fri Jun 9 18:20:43 2017 +
Commit: Brian Evans gentoo org>
CommitDate: Fri Jun 9 18:21:17 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=472703f5
dev-db/myodbc: Fix undefined references with gcc 5 std change
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-db/myodbc/myodbc-5.2.7-r1.ebuild | 5 -
dev-db/myodbc/myodbc-5.2.7-r2.ebuild | 5 -
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/dev-db/myodbc/myodbc-5.2.7-r1.ebuild
b/dev-db/myodbc/myodbc-5.2.7-r1.ebuild
index aea3236e0f0..22819c507ce 100644
--- a/dev-db/myodbc/myodbc-5.2.7-r1.ebuild
+++ b/dev-db/myodbc/myodbc-5.2.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -43,6 +43,9 @@ src_prepare() {
epatch "${FILESDIR}/cmake-doc-path.patch" \
"${FILESDIR}/${PVR}-cxxlinkage.patch" \
"${FILESDIR}/${PV}-mariadb-dynamic-array.patch"
+
+ # Fix undefined references due to standards change
+ append-cflags -std=gnu89
}
multilib_src_configure() {
diff --git a/dev-db/myodbc/myodbc-5.2.7-r2.ebuild
b/dev-db/myodbc/myodbc-5.2.7-r2.ebuild
index 24446560e0c..e475faca21e 100644
--- a/dev-db/myodbc/myodbc-5.2.7-r2.ebuild
+++ b/dev-db/myodbc/myodbc-5.2.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -46,6 +46,9 @@ src_prepare() {
"${FILESDIR}/${PV}-r1-cxxlinkage.patch" \
"${FILESDIR}/${PV}-mariadb-dynamic-array.patch" \
"${FILESDIR}/${PV}-my_malloc.patch"
+
+ # Fix undefined references due to standards change
+ append-cflags -std=gnu89
}
multilib_src_configure() {
[gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/files/, dev-db/myodbc/
commit: ee33fca0291ace24e1155fe4c70fb8cf7cb399d4
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Tue Aug 11 17:14:28 2015 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Tue Aug 11 17:14:28 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee33fca0
dev-db/myodbc Add patch from bug 548912 and fix bug 557302
Package-Manager: portage-2.2.20
dev-db/myodbc/files/5.2.7-my_malloc.patch | 18 ++
dev-db/myodbc/myodbc-5.2.7-r2.ebuild | 5 +++--
2 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/dev-db/myodbc/files/5.2.7-my_malloc.patch
b/dev-db/myodbc/files/5.2.7-my_malloc.patch
new file mode 100644
index 000..bc6c65e
--- /dev/null
+++ b/dev-db/myodbc/files/5.2.7-my_malloc.patch
@@ -0,0 +1,18 @@
+diff -Brau a/util/odbcinstw.c b/util/odbcinstw.c
+--- a/util/odbcinstw.c 2014-04-23 21:54:40.0 +0200
b/util/odbcinstw.c 2015-05-08 15:29:09.400568356 +0200
+@@ -68,13 +68,7 @@
+
+ if (lpszRetBuffer cbRetBuffer)
+ {
+-ret= malloc(cbRetBuffer + 1);
+-/*
+- We cannot rely on getting correct results from the next call of
+- SQLGetPrivateProfileString. So, taking precautions against unititialized
+- values in the allocated buffer.
+-*/
+-memset(ret, 0, cbRetBuffer + 1);
++ret= my_malloc(cbRetBuffer + 1, MYF(MY_ZEROFILL));
+ }
+ else
+ ret= NULL;
diff --git a/dev-db/myodbc/myodbc-5.2.7-r2.ebuild
b/dev-db/myodbc/myodbc-5.2.7-r2.ebuild
index cf7133d..65b99da 100644
--- a/dev-db/myodbc/myodbc-5.2.7-r2.ebuild
+++ b/dev-db/myodbc/myodbc-5.2.7-r2.ebuild
@@ -44,8 +44,9 @@ src_prepare() {
# Patch document path so it doesn't install files to /usr
epatch ${FILESDIR}/cmake-doc-path.patch \
- ${FILESDIR}/${PVR}-cxxlinkage.patch \
- ${FILESDIR}/${PV}-mariadb-dynamic-array.patch
+ ${FILESDIR}/${PV}-r1-cxxlinkage.patch \
+ ${FILESDIR}/${PV}-mariadb-dynamic-array.patch \
+ ${FILESDIR}/${PV}-my_malloc.patch
}
multilib_src_configure() {
